diff --git a/.tx/config b/.tx/config
index c08b50e7040b9f45728a9af0db2efb87d24de103..84efc7b52fa541db4942747ede3c1d88a3bb8a1e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 type = PO
 
-[FusionDirectory-110.core]
+[FusionDirectory-1x.core]
 file_filter = locale/<lang>/fusiondirectory.po
 source_file = locale/en/fusiondirectory.po
 source_lang = en
diff --git a/Changelog b/Changelog
index 9f6b49e23e6cdd4a97deec03f6610e00f26dab50..c754d4fdaed1ec65b6c5bc1b91b152e3eb388626 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,121 @@
 FusionDirectory changelog
 =========================
 
+* 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
diff --git a/README.md b/README.md
index 233203b136424171291d955fe4f07f1adf9e9384..7054e9c3f1bb26de551a30fb8772dda56593b962 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=fusiondirectory&url=https://github.com/fusiondirectory&title=FusionDirectory&language=en_GB&tags=github&category=software) 
+[Donate to FusionDirectory on Liberapay](https://liberapay.com/fusiondirectory/donate)
 
diff --git a/contrib/bin/fusiondirectory-insert-schema b/contrib/bin/fusiondirectory-insert-schema
index cca75704d29e7d32a4fd10eb228ed4507ec9d2ec..179a3efe559181ff7f93b92e416a6fd1065bcc19 100644
--- a/contrib/bin/fusiondirectory-insert-schema
+++ b/contrib/bin/fusiondirectory-insert-schema
@@ -7,7 +7,7 @@
 # Manipulate and insert the needed schema into the ldap server
 #
 #  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-#  Copyright (C) 2011-2016  FusionDirectory
+#  Copyright (C) 2011-2017  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,319 +30,17 @@ use warnings;
 
 use 5.008;
 
-my $ldap_host_options = '-Y EXTERNAL -H ldapi:///';
-my $path              = "/etc/ldap/schema/fusiondirectory/";
-my $full_cmd          = "";
-my $schema2ldif       = "schema2ldif";
-
-my $listschemas = 0;
-my $modify      = 0;
-my $schemalist  = 0;
-my $yes_flag    = 0;
-my $pathunset   = 1;
-my $continue    = 0;
-my @schemas     = ();
-my @gen_files   = ();
-my $delete_ldif = 1;
-foreach my $arg ( @ARGV ) {
-  if (not defined $ldap_host_options) {
-    $ldap_host_options = $arg;
-  } elsif ((lc($arg) eq '-i') || (lc($arg) eq '--insert')) {
-    if ($schemalist) {
-      usage();
-    }
-    $schemalist = 1;
-  } elsif ((lc($arg) eq '-l') || (lc($arg) eq '--list')) {
-    $listschemas = 1;
-  } elsif ((lc($arg) eq '-c') || (lc($arg) eq '--continue')) {
-    $continue = 1;
-  } elsif ((lc($arg) eq '-e') || (lc($arg) eq '--empty')) {
-    if ($schemalist) {
-      usage();
-    }
-    $modify = 2;
-    $schemalist = 1;
-  } elsif ((lc($arg) eq '-m') || (lc($arg) eq '--modify')) {
-    if ($schemalist) {
-      usage();
-    }
-    $modify = 1;
-    $schemalist = 1;
-  } elsif ((lc($arg) eq '-o') || (lc($arg) eq '--options')) {
-    undef $ldap_host_options;
-  } elsif ((lc($arg) eq '-n') || (lc($arg) eq '--nodelete')) {
-    $delete_ldif = 0;
-  } elsif ((lc($arg) eq '-y') || (lc($arg) eq '--yes')) {
-    $yes_flag = 1;
-  } elsif ((lc($arg) eq '-h') || (lc($arg) eq '--help')) {
-    usage();
-  } elsif ($schemalist) {
-    if ($arg =~ /(.*).ldif/) { # ignore ".ldif" if it is there
-      push @schemas, $1;
-    } elsif ($arg =~ /(.*).schema/) {
-      if (system("$schema2ldif $arg > $1.ldif") == 0) {
-        push @schemas, $1;
-        push @gen_files, $1;
-      } else {
-        push @gen_files, $1;
-        die_with_error("Something went wrong while trying to convert $arg to ldif\n");
-      }
-    } else {
-      push @schemas, $arg;
-    }
-  } elsif ($pathunset) {
-    $path = $arg."/";
-    $pathunset = 0;
-  } else {
-    usage();
-  }
-}
-
-# if --options is used with no value
-usage () if (not defined $ldap_host_options);
-
-# die if user is not "root"
-die_with_error ("! You have to run this script as root\n") if ($<!=0);
-
-my $add_cmd         = "ldapadd $ldap_host_options -f ";
-my $mod_cmd         = "ldapmodify $ldap_host_options -f ";
-my $ldapsearch      = "ldapsearch $ldap_host_options ";
-my $search_cmd      = $ldapsearch." -b \"cn=schema,cn=config\" cn={*}";
-my $list_cmd        = $search_cmd."* cn 2>/dev/null";
-my $cnconfig_cmd    = $ldapsearch." -b \"cn=config\" cn=config dn 2>/dev/null | grep dn:";
-
-if ($listschemas) {
-  list_schemas();
-  exit 0;
-}
-
-# die if the path doesn't exists
-die_with_error ("! $path doesn't seems to exists\n") if (!-e $path);
-
-#die if we are not in cn=config
-my $cnconfig = `$cnconfig_cmd`;
-if (!($cnconfig =~ m/^dn:\s*cn=config$/)) {
-  die_with_error ("! This tool is only intended to be with with a cn=config backend, cn=config could not be found in the LDAP");
-}
-
-if (scalar(@schemas) == 0) {
-  if ($modify == 2) {
-    usage("Missing schema list for -e option\n");
-  }
-  # insert the default schemas
-  @schemas = ("core-fd","core-fd-conf","ldapns","template-fd");
-  foreach my $schema (@schemas) {
-    if (system("$schema2ldif $path$schema.schema > $path$schema.ldif") == 0) {
-      push @gen_files, $path.$schema;
-    } else {
-      die_with_error ("Something went wrong while trying to convert $path$schema.schema to ldif\n");
-    }
-  }
-} elsif ($pathunset) {
-  $path = "";
-}
-
-if ($modify == 2) {
-  unless (ask_yn_question("Are you sure you want to empty schema(s) ".join(", ",@schemas)."?"))
-  {
-    die_with_error("Aborting…\n");
-  }
-}
-
-$continue++; # activating continue feature only for insertions
-
-foreach my $schema (@schemas) {
-  my $schema_name = "";
-  my $ldif_file;
-
-  if ($modify < 2) {
-    # Searching schema name in ldif file first line.
-    open $ldif_file, q{<}, $path.$schema.".ldif" or die "Count not open ldif file : $!\n";
-    my $dn = "";
-    while ($dn eq "") {
-      chomp($dn = <$ldif_file>);
-    }
-    if ($dn =~ /^dn: cn=([^,]+),/) {
-      $schema_name = $1;
-    }
-    close($ldif_file);
-  }
-
-  # Fallback on file name
-  if ($schema_name eq "") {
-    $schema_name = $schema;
-    $schema_name =~ s|^.*/||;
-  }
-
-  insert_schema($schema, $schema_name);
-}
-
-remove_ldifs();
-
-sub insert_schema
-{
-  my($schema, $schema_name) = @_;
-  my $schema_file;
-  my $update_file;
-  my $empty_file;
-
-  $full_cmd = $search_cmd.$schema_name." cn";
-  print ("\n");
-  my $search = `$full_cmd`;
-
-  if ($search !~ /# numEntries: 1/m) {
-    if ($modify) {
-      print "$schema_name does not exists in the LDAP, skipping…\n";
-    } else {
-      # if the schema doesn't already exists in the LDAP server, adding it
-      $full_cmd = $add_cmd.$path.$schema.".ldif";
-      print "executing '$full_cmd'\n";
-      if (system ($full_cmd) != 0) {
-        die_with_error ("Insertion failed!\n");
-      }
-    }
-  } else {
-    if ($modify) {
-      if ($search !~ m/dn: ([^,]+),cn=schema,cn=config/) {
-        print "Could not parse existing dn for $schema_name, skipping…\n";
-        return;
-      }
-      my $dn_part = $1;
-      # if the schema already exists in the LDAP server, modify it
-      if ($modify == 1) {
-        open($schema_file, q{<}, $path.$schema.".ldif") or die_with_error('Could not open '."<".$path.$schema.".ldif: $!");
-        open($update_file, q{>}, $path.$schema."_update.ldif") or die_with_error('Could not open '.">".$path.$schema."_update.ldif: $!");
-        push @gen_files, $path.$schema."_update";
-        my $attrs   = 0;
-        my $classes = 0;
-        while (<$schema_file>) {
-          next if m/^#/; # remove comments
-          chomp;
-          next if m/^$/; # remove empty lines
-          if (m/^dn: cn=([^,]+),cn=schema,cn=config$/) {
-            print $update_file "dn: $dn_part,cn=schema,cn=config\n";
-            print $update_file "changetype: modify\n";
-            next;
-          }
-          if (!m/^olcAttributeTypes:/ && !m/^olcObjectClasses:/ && !m/^ /) {
-            #skip cn, objectClass, …
-            next;
-          }
-
-          if (!$attrs && $classes) {
-            die "Malformed schema\n";
-          }
-
-          if (!$attrs && m/^olcAttributeTypes:/) {
-            $attrs = 1;
-            print $update_file "replace: olcAttributeTypes\n";
-          }
-          if (!$classes && m/^olcObjectClasses:/) {
-            $classes = 1;
-            print $update_file "-\n";
-            print $update_file "replace: olcObjectClasses\n";
-          }
-
-          print $update_file $_;
-          print $update_file "\n";
-        }
-        close $schema_file;
-        close $update_file;
-      } else { # Emptying schema
-        open($empty_file,  q{>}, $path.$schema."_update.ldif") or die_with_error('Could not open '.">".$path.$schema."_update.ldif: $!");
-        push @gen_files, $path.$schema."_update";
-        print $empty_file "dn: $dn_part,cn=schema,cn=config\n";
-        print $empty_file "changetype: modify\n";
-        print $empty_file "delete: olcAttributeTypes\n";
-        print $empty_file "-\n";
-        print $empty_file "delete: olcObjectClasses\n";
-        print $empty_file "-\n";
-        close $empty_file;
-      }
-      $full_cmd = $mod_cmd.$path.$schema."_update.ldif";
-      print "executing '$full_cmd'\n";
-      if (system ($full_cmd) != 0) {
-        die_with_error ("Insertion failed!\n");
-      }
-    } else {
-      print "$schema_name already exists in the LDAP, skipping…\n";
-    }
-  }
-}
-
-sub remove_ldifs
-{
-  if ($delete_ldif) {
-    foreach my $file (@gen_files) {
-      unlink "$file.ldif" or print "Could not delete $file.ldif\n";
-    }
-  }
-}
-
-sub die_with_error
-{
-  my ($error) = @_;
-  if ($continue == 2) {
-    print "Error: $error\nContinuing…\n";
-  } else {
-    remove_ldifs();
-    die $error;
-  }
-}
-
-sub list_schemas
-{
-  my @schemas = `$list_cmd`;
-  foreach my $schema (@schemas) {
-    if ($schema =~ m/cn:\s*{[0-9]+}(.*)$/) {
-      print "$1\n";
-    }
-  }
-}
-
-# ask a question send as parameter, and return true if the answer is "yes"
-sub ask_yn_question {
-  return 1 if ($yes_flag);
-  my ($question) = @_;
-  print ( "$question [Yes/No]?\n" );
-
-  while ( my $input = <STDIN> ) {
-    # remove the \n at the end of $input
-    chomp $input;
-
-    # if user's answer is "yes"
-    if ( lc($input) eq "yes" || lc($input) eq "y") {
-      return 1;
-    # else if he answer "no"
-    } elsif ( lc($input) eq "no" || lc($input) eq "n") {
-      return 0;
-    }
-  }
-}
-
-sub usage
-{
-  (@_) && print STDERR "\n@_\n\n";
-
-  print STDERR << "EOF";
- usage: $0 [-h] [-y] [-l] [-o options] [path] [-i|-m|-e schema1 schema2 …]
-
-  -h, --help      : this (help) message
-  path            : where to find the schemas
-  -i, --insert    : specify the schemas to insert
-  -l, --list      : list inserted schemas
-  -m, --modify    : modify exising inserted schemas
-  -e, --empty     : empty exising inserted schemas (do not remove them)
-  -n, --nodelete  : do not delete generated ldifs at the end
-  -o, --options   : set ldap options used (default is -Y EXTERNAL -H ldapi:///)
-  -c, --continue  : continue on error(s)
-  -y, --yes       : answer yes to all questions
-
-EOF
-  exit -1;
-}
-
-exit 0;
+my $ldapSchemaManager = 'ldap-schema-manager';
+my $defaultpath       = "/etc/ldap/schema/fusiondirectory/";
+my @defaultschemas    = ("core-fd.schema","core-fd-conf.schema","ldapns.schema","template-fd.schema");
+
+exec (
+  $ldapSchemaManager,
+  '--tool-name', $0,
+  '--default-path', $defaultpath,
+  '--default-schemas', @defaultschemas, '--end',
+  @ARGV
+);
 
 =head1 NAME
 
@@ -350,11 +48,11 @@ fusiondirectory-insert-schema - insert schema needed by FusionDirectory into the
 
 =head1 SYNOPSIS
 
-fusiondirectory-insert-schema [<path of your schema files>] [-l] [-i|-m schema1 schema2]
+fusiondirectory-insert-schema [-y] [-n] [-c] [-o options] [path] [-h|-l|-i schema1 schema2|-m schema1 schema2|-e schema1 schema2]
 
 =head1 DESCRIPTION
 
-This program will insert the schema needed by FusionDirectory into the ldap server
+This program will insert the schema needed by FusionDirectory into the ldap server, or the specified schemas
 
 
 =head2 Options
@@ -435,7 +133,7 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
 
 =over 1
 
-=item Copyright (C) 2011-2016 FusionDirectory Project
+=item Copyright (C) 2011-2017 FusionDirectory Project
 
 =back
 
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 24acc1155b82c39151caada40ba05835291f4f5a..b976cfa7d72bdc7878d26a27cdbb00073b64f1dd 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -7,7 +7,7 @@
 #  Manage fusiondirectory installs from the command line
 #
 #  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-#  Copyright (C) 2011-2016  FusionDirectory
+#  Copyright (C) 2011-2017  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
@@ -94,6 +94,7 @@ my $grouprdn    = "ou=groups";
 my $systemrdn   = "ou=systems";
 my $dnsrdn      = "ou=dns";
 my $dhcprdn     = "ou=dhcp";
+my $workstationrdn  = "ou=workstations,ou=systems";
 
 #################################################################################################################################################
 
@@ -516,11 +517,11 @@ sub check_directories {
 
       # if $dir is one of the dirs that remains to root
       if ( grep (/.*$dir.*/, @root_config_dirs) ) {
-        check_rights($dir,"root","root",0755,1);
+        check_rights($dir,"root","root",oct(755),1);
 
       # else if $dir is one of the dirs that remains to apache's user group, and the dir's owner is not root or the group is not the apache's user group, modifying owner
       } elsif ( grep ( /.*$dir.*/, @apache_config_dirs) ) {
-        check_rights($dir,"root",$apache_group,0770,1);
+        check_rights($dir,"root",$apache_group,oct(770),1);
       }
   }
 }
@@ -530,7 +531,7 @@ sub check_config {
   my $apache_group = get_apache_group();
 
   # check config file
-  check_rights($fd_config,"root",$apache_group,0640,0) or die 'The config file does not exists!';
+  check_rights($fd_config,"root",$apache_group,oct(640),0) or die 'The config file does not exists!';
 }
 
 ############################################################# Change install directories #################################################################################
@@ -729,8 +730,6 @@ sub get_ldap_connexion {
   my $uri = "";
   my $base = "";
   my $tls = 0;
-  my $secret_file;
-  my $ldap_conf;
 
   # read ldap's server's info from /etc/fusiondirectory/fusiondirectory.conf
   if (-e $fd_config) {
@@ -794,21 +793,21 @@ sub get_ldap_connexion {
 
   # bind to the LDAP server
   if (-e $fd_secrets) {
-    open($secret_file, q{<}, $fd_secrets) || die ("Could not open $fd_secrets");
+    open(my $secrets, q{<}, $fd_secrets) || die ("Could not open $fd_secrets");
     my $key = "";
-    while(<$secret_file>) {
+    while(<$secrets>) {
       if ($_ =~ m/RequestHeader set FDKEY ([^ \n]+)\n/) {
         $key = $1;
         last;
       }
     }
-    close($secret_file);
+    close($secrets);
     $bind_pwd = cred_decrypt($bind_pwd, $key);
   }
 
   if ($tls) {
     # Read LDAP config file
-    open ($ldap_conf, q{<}, $vars{ldap_conf}) or die ("! Failed to open ldap config file '$vars{ldap_conf}': $!\n");
+    open (my $ldapconf, q{<}, $vars{ldap_conf}) or die ("! Failed to open ldap config file '$vars{ldap_conf}': $!\n");
 
     my %tls_options = (
       'REQCERT'   => 'require',
@@ -818,14 +817,14 @@ sub get_ldap_connexion {
       'CACERT'    => '',
     );
     # Scan LDAP config
-    while (<$ldap_conf>) {
+    while (<$ldapconf>) {
       /^\s*(#|$)/ && next;
       chomp;
       if (m/^TLS_(REQCERT|CERT|KEY|CACERTDIR|CACERT)\s+(.*)\s*$/i) {
         $tls_options{uc $1} = $2;
       }
     }
-    close($ldap_conf);
+    close($ldapconf);
 
     $ldap->start_tls(
       verify      => $tls_options{'REQCERT'},
@@ -1165,9 +1164,6 @@ sub install_plugins {
     # copy includes
     create_and_copy_plugin_dir($plugin_path."/include/",$vars{fd_home}."/include/");
 
-    # copy etc FIXME !!! not right all files goes now to /var/cache/fusiondirectory/plugin
-    #my $files_dirs_copied = rcopy($plugin_path."/etc/*", $vars{fd_config_dir});
-
     # copy the locales
     create_and_copy_plugin_dir($plugin_path."/locale/",$vars{fd_home}."/locale/plugins/".$plugin);
 
@@ -1218,206 +1214,11 @@ sub migrate_users {
     }
   }
 
-  $mesg = $ldap->search(
-    filter => '(objectClass=gosaAccount)',
-    base   => $base
-  );
-  $mesg->code && die $mesg->error;
-
-  if ($mesg->count > 0) {
-    print ("The following users are using the obsolete gosaAccount objectClass:\n");
-
-    my @entries = $mesg->entries;
-
-    foreach my $entry (@entries) {
-      print $entry->dn()."\n";
-    }
-
-    if (ask_yn_question("Remove the gosaAccount objectClass from these entries?")) {
-      foreach my $entry (@entries) {
-        my @replace;
-        my @delete;
-        my @classes = $entry->get_value('objectClass');
-        if (grep {$_ eq 'gosaAccount'} @classes) {
-          foreach my $class (@classes) {
-            if ($class ne 'gosaAccount') {
-              push(@replace, "$class");
-            }
-          }
-          if (
-              ($entry->exists('dateOfBirth') || $entry->exists('personalTitle') || $entry->exists('gender'))
-              && !(grep {$_ eq 'fdPersonalInfo'} @classes)
-            ) {
-            push(@replace, "fdPersonalInfo");
-          }
-          if (!(grep {$_ eq 'sambaSamAccount'} @classes)) {
-            foreach my $sambaAttr ('sambaLMPassword','sambaNTPassword','sambaPwdLastSet','sambaBadPasswordCount','sambaBadPasswordTime') {
-              if ($entry->exists($sambaAttr)) {
-                push(@delete, $sambaAttr);
-              }
-            }
-          }
-        }
-        if (scalar(@delete) > 0) {
-          $mesg = $ldap->modify($entry->dn(), delete  => \@delete, replace => [ "objectClass" => \@replace ]);
-          $mesg->code && print $entry->dn()." (deleting samba attributes): ".$mesg->error."\n";
-        } else {
-          $mesg = $ldap->modify($entry->dn(), replace => [ "objectClass" => \@replace ]);
-          $mesg->code && print $entry->dn().": ".$mesg->error."\n";
-        }
-        undef @replace;
-        undef @delete;
-      }
-    }
-  }
-
   # unbind to the LDAP server
   my $unbind = $ldap->unbind;
   $unbind->code && warn "! Unable to unbind from LDAP server: ", $unbind->error."\n";
 }
 
-# function that moves DNS zones from systems to ou=dns
-sub migrate_dns {
-  # 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};
-
-  # Search for DNS zones
-  my $mesg = $ldap->search(
-    base => "$base",
-    filter => "(&(objectClass=dNSZone)(relativeDomainName=@)(!(|(zoneName=*.arpa)(zoneName=*.arpa.))))",
-    attrs => ['zoneName']
-  );
-  $mesg->code && die $mesg->error;
-
-  my @entries = $mesg->entries;
-
-  print "There are ".$mesg->count." DNS zones in the LDAP\n";
-
-  my @baddns  = ();
-
-  foreach my $entry (@entries) {
-    if ($entry->dn() !~ m/$dnsrdn/) {
-      if (scalar(@baddns) == 0) {
-        print "The following are not in the DNS branch ($dnsrdn):\n";
-      }
-      print $entry->dn()."\n";
-      push @baddns, $entry->dn();
-    }
-  }
-
-  if (scalar(@baddns) == 0) {
-    print "They all already are in the DNS branch ($dnsrdn):\n";
-  } else {
-    if (ask_yn_question("Move these entries to the DNS branch ($dnsrdn)?")) {
-      foreach my $entrydn (@baddns) {
-        $entrydn =~ m/^([^,]+),(.+$systemrdn,(.+))$/ or die "Could not parse dn ".$entrydn."\n";
-        my $rdn = $1;
-        my $systemdn = $2;
-        my $entrybase = $3;
-        if (!branch_exists($ldap, "$dnsrdn,$entrybase")) {
-          create_branch($ldap, $entrybase, $dnsrdn);
-        }
-        my $result = $ldap->moddn (
-          $entrydn,
-          newrdn        => $rdn,
-          deleteoldrdn  => '1',
-          newsuperior   => "$dnsrdn,$entrybase"
-        );
-        $result->code && die "Migration of DNS zone entry failed, LDAP error: ".$result->error."\n";
-
-        my $zoneDn = "$rdn,$dnsrdn,$entrybase";
-
-        $mesg = $ldap->search(
-          base    => $zoneDn,
-          filter  => "(&(objectClass=dNSZone)(relativeDomainName=*)(!(|(zoneName=*.arpa)(zoneName=*.arpa.))))"
-        );
-        $mesg->code && die $mesg->error;
-
-        @entries = $mesg->entries;
-
-        foreach my $entry (@entries) {
-          $entry->dn() =~ m/^([^,]+),(relativeDomainName=[^,]+),$zoneDn$/ or next;
-          $rdn = $1;
-          my $relativeDomainName = $2;
-          if ($rdn eq $relativeDomainName) {
-            my %replace = ();
-            my @attributes = $entry->attributes();
-            foreach my $attr (@attributes) {
-              $replace{$attr} = $entry->get_value($attr, asref => 1)
-            }
-            $result = $ldap->modify (
-              "$rdn,$zoneDn",
-              replace => \%replace
-            );
-            $result->code && die "Migration of DNS zone subentry failed, LDAP error: ".$result->error."\n";
-            $result = $ldap->delete ($entry->dn());
-          } else {
-            $result = $ldap->moddn (
-              $entry->dn(),
-              newrdn        => $rdn,
-              deleteoldrdn  => '1',
-              newsuperior   => $zoneDn
-            );
-          }
-          $result->code && die "Migration of DNS zone subentry failed, LDAP error: ".$result->error."\n";
-        }
-
-        # Fix reverse zone PTR records DNs
-        $mesg = $ldap->search(
-          base    => $zoneDn,
-          filter  => "(&(objectClass=dNSZone)(!(relativeDomainName=@))(|(zoneName=*.arpa)(zoneName=*.arpa.)))"
-        );
-        $mesg->code && die $mesg->error;
-
-        @entries = $mesg->entries;
-
-        foreach my $entry (@entries) {
-          $entry->dn() =~ m/^([^,]+),relativeDomainName=[^,]+,$zoneDn$/ or next;
-          $result = $ldap->moddn (
-            $entry->dn(),
-            newrdn        => $1,
-            deleteoldrdn  => '1',
-            newsuperior   => 'zoneName='.$entry->get_value('zoneName').','.$zoneDn
-          );
-          $result->code && die "Migration of DNS reverse zone subentry ".$entry->dn()." failed, LDAP error: ".$result->error."\n";
-        }
-
-        # Add DNS tab on server
-        $mesg = $ldap->search(
-          base    => $systemdn,
-          scope   => 'base',
-          filter  => '(objectClass=*)'
-        );
-        $mesg->code && die $mesg->error;
-        my $system_entry = $mesg->shift_entry;
-        $system_entry->get_value('objectClass');
-        my @classes = $system_entry->get_value('objectClass');
-        if (grep {$_ eq 'fdDNSHost'} @classes) {
-          $result = $ldap->modify (
-            "$systemdn",
-            add => {
-              'fdDNSZoneDn' => $zoneDn,
-            }
-          );
-        } else {
-          $result = $ldap->modify (
-            "$systemdn",
-            add => {
-              'fdDNSZoneDn' => $zoneDn,
-              'objectClass' => 'fdDNSHost'
-            }
-          );
-        }
-        $result->code && print "Could not add DNS tab on $systemdn, LDAP error: ".$result->error."\nYou'll need to activate it yourself\n";
-      }
-    }
-  }
-}
-
 # function that moves DHCP configurations from systems to ou=dhcp
 sub migrate_dhcp {
   # initiate the LDAP connexion
@@ -1508,139 +1309,6 @@ sub migrate_dhcp {
   }
 }
 
-sub migrate_acls {
-  # 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};
-
-  # Search for old formatted ACLs
-  my $mesg = $ldap->search(
-    base => "$base",
-    filter => "(gosaAclEntry=*)",
-    attrs => ['gosaAclEntry']
-  );
-  $mesg->code && die $mesg->error;
-
-  while (my $entry = $mesg->shift_entry) {
-    my $acls = $entry->get_value('gosaAclEntry', asref => 1);
-    my @nacls = ();
-    my $old_formats = 0;
-    ACL: foreach my $acl (@$acls) {
-      my $old_format = 0;
-      my ($index,$scope,$part1,$part2,$filter);
-      if ($acl =~ m/:(p?sub|role):/) {
-        $old_format = 1;
-        ($index,$scope,$part1,$part2,$filter) = split(':', $acl);
-      } elsif ($acl !~ m/:subtree:/) {
-        # With one or base scope we can't know, we have to check other parts
-        ($index,$scope,$part1,$part2,$filter) = split(':', $acl);
-        my $dn = decode_base64($part1);
-        $mesg = $ldap->search(
-          base    => "$dn",
-          scope   => 'base',
-          filter  => '(objectClass=gosaRole)'
-        );
-        die_on_ldap_errors($mesg);
-        if ($mesg->count == 0) {
-          $old_format = 1;
-        }
-      }
-      if ($old_format) {
-        $old_formats = 1;
-        print "$acl needs migration\n";
-        my ($role_dn, $members);
-        if ($scope eq 'role') {
-          $role_dn = decode_base64($part1);
-          $members = $part2;
-          # Find scope in role
-          $mesg = $ldap->search(
-            base    => $role_dn,
-            scope   => 'base',
-            filter  => '(objectClass=gosaRole)'
-          );
-          die_on_ldap_errors($mesg);
-          if (my $role_entry = $mesg->shift_entry) {
-            my $acl_templates = $role_entry->get_value('gosaAclTemplate', asref => 1);
-            my $scope = '';
-            foreach my $acl_template (@$acl_templates) {
-              my ($t_index,$t_scope,$t_acl) = split(':',$acl_template);
-              if ($scope eq '') {
-                $scope = $t_scope;
-              } elsif ($scope ne $t_scope) {
-                print "We don't know how to migrate role $role_dn as it contains several scopes\n";
-                push @nacls, $acl;
-                next ACL;
-              }
-            }
-            push @nacls, "$index:$scope:".encode_base64($role_dn).":$members";
-          } else {
-            # Removing invalid ACL
-            print "Removing acl as associated role $role_dn does not exists\n";
-            next ACL;
-          }
-        } else {
-          my $cn = find_free_role_dn($ldap,$base,'migrated-acl');
-          $role_dn = create_role($ldap,$base,$cn,$part2);
-          $members = $part1;
-          if ($scope =~ m/sub$/) {
-            $scope = 'subtree';
-          }
-          push @nacls, "$index:$scope:".encode_base64($role_dn).":$members";
-        }
-      } else {
-        push @nacls, $acl;
-      }
-    }
-    if ($old_formats) {
-      @nacls = sort @nacls;
-      my $i = 0;
-      for (@nacls) { s/^[0-9]*:/$i:/; $i++ }; # Re-index acls
-      my $result = $ldap->modify (
-        $entry->dn,
-        replace => {
-          'gosaAclEntry'  => \@nacls
-        }
-      );
-      $result->code && warn "\n! failed to migrate ACL for '".$entry->dn."' - ".$result->error_name.": ".$result->error_text;
-      print "Migrated acls for '".$entry->dn."'\n";
-    }
-  }
-
-  # Search for old formatted ACL roles
-  $mesg = $ldap->search(
-    base => "$base",
-    filter => "(gosaAclTemplate=*:*:*)",
-    attrs => ['gosaAclTemplate']
-  );
-  $mesg->code && die $mesg->error;
-  ROLE: while (my $role_entry = $mesg->shift_entry) {
-    my $acl_templates = $role_entry->get_value('gosaAclTemplate', asref => 1);
-    my $scope = '';
-    my @ntemplates = ();
-    foreach my $acl_template (@$acl_templates) {
-      my ($t_index,$t_scope,$t_acl) = split(':',$acl_template);
-      if ($scope eq '') {
-        $scope = $t_scope;
-      } elsif ($scope ne $t_scope) {
-        print "We don't know how to migrate role '".$role_entry->dn."' as it contains several scopes\n";
-        next ROLE;
-      }
-      push @ntemplates, $t_index.':'.$t_acl;
-    }
-    my $result = $ldap->modify (
-      $role_entry->dn,
-      replace => {
-        'gosaAclTemplate'  => \@ntemplates
-      }
-    );
-    $result->code && warn "\n! failed to migrate ACL for '".$role_entry->dn."' - ".$result->error_name.": ".$result->error_text;
-    print "Migrated role '".$role_entry->dn."'\n";
-  }
-}
-
 sub delete_gosa_locks {
   # initiate the LDAP connexion
   my %hash_ldap_param = get_ldap_connexion();
@@ -1699,8 +1367,95 @@ sub get_deprecated {
   return (\@obsolete_attrs, \@obsolete_classes);
 }
 
-# function that migrates printers from FD<=1.0.13 to FD>=1.0.14
-sub migrate_printers {
+# function that migrates systems from FD<1.1 to FD>=1.1
+sub migrate_systems {
+  # 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 @oldOCs = ('gotoWorkstation',  'goServer', 'gotoTerminal', 'gotoDevice');
+  my @newOCs = ('fdWorkstation',    'fdServer', 'fdTerminal',   'device');
+  foreach my $i (0 .. $#oldOCs) {
+    my $oldOC = $oldOCs[$i];
+    my $newOC = $newOCs[$i];
+
+    my $mesg = $ldap->search(
+      filter => "(objectClass=$oldOC)",
+      base   => $base
+    );
+    $mesg->code && die $mesg->error;
+
+    if ($mesg->count > 0) {
+      print ("The following systems are using the obsolete $oldOC objectClass:\n");
+
+      my @entries = $mesg->entries;
+
+      foreach my $entry (@entries) {
+        print $entry->dn()."\n";
+      }
+
+      if (ask_yn_question("Migrate these entries to $newOC objectClass?")) {
+        foreach my $entry (@entries) {
+          my $tmprdn = "cn=".$entry->get_value('cn')."+ipHostNumber=".$entry->get_value('ipHostNumber');
+          my $newrdn = "cn=".$entry->get_value('cn');
+          my $dn_old = $entry->dn();
+          my $dn_new = $entry->dn();
+          $dn_new =~ s/^[^,]+,/$tmprdn,/;
+          $entry->dn($dn_new);
+          my @replace = ('ieee802Device', 'ipHost', $newOC);
+          my @classes = $entry->get_value('objectClass');
+          foreach my $class (@classes) {
+            if (($class ne $oldOC) && ($class ne 'GOhard')) {
+              push(@replace, "$class");
+            }
+          }
+          $entry->replace("objectClass" => \@replace);
+          if ($entry->exists('gotoMode')) {
+            my $gotoMode = $entry->get_value('gotoMode');
+            if ($gotoMode eq 'locked') {
+              $entry->add('fdMode' => 'locked');
+            } else {
+              $entry->add('fdMode' => 'unlocked');
+            }
+            $entry->delete('gotoMode');
+          }
+          if ($entry->exists('argonautLdap2zoneAllowNotify')) {
+            $entry->delete('argonautLdap2zoneAllowNotify');
+          }
+          $mesg = $ldap->add($entry);
+          if ($mesg->code) {
+            print $entry->dn().": ".$mesg->error."\n";
+            next;
+          }
+          undef @replace;
+          $mesg = $ldap->delete($dn_old);
+          if ($mesg->code) {
+            print $entry->dn().": ".$mesg->error."\n";
+            next;
+          }
+          $mesg = $ldap->moddn($dn_new, newrdn => $newrdn);
+          if ($mesg->code) {
+            print $entry->dn().": ".$mesg->error."\n";
+            next;
+          }
+        }
+      }
+    } else {
+      print "Found no system using $oldOC\n";
+    }
+  }
+
+  # unbind to the LDAP server
+  my $unbind = $ldap->unbind;
+  $unbind->code && warn "! Unable to unbind from LDAP server: ", $unbind->error."\n";
+}
+
+# function that migrates winstations from FD<1.1 to FD>=1.1
+sub migrate_winstations
+{
   # initiate the LDAP connexion
   my %hash_ldap_param = get_ldap_connexion();
 
@@ -1709,13 +1464,13 @@ sub migrate_printers {
   my $ldap = $hash_ldap_param{ldap};
 
   my $mesg = $ldap->search(
-    filter => '(objectClass=gotoPrinter)',
+    filter => "(&(!(objectClass=fdWorkstation))(objectClass=sambaSamAccount))",
     base   => $base
   );
   $mesg->code && die $mesg->error;
 
   if ($mesg->count > 0) {
-    print ("The following printers are using the obsolete gotoPrinter objectClass:\n");
+    print ("The following winstations are not using the new fdWorkstation objectClass:\n");
 
     my @entries = $mesg->entries;
 
@@ -1723,20 +1478,90 @@ sub migrate_printers {
       print $entry->dn()."\n";
     }
 
-    if (ask_yn_question("Migrate these entries to fdPrinter objectClass?")) {
+    if (ask_yn_question("Migrate these entries to fdWorkstation objectClass?")) {
       foreach my $entry (@entries) {
-        my $newrdn = "cn=".$entry->get_value('cn')."+ipHostNumber=".$entry->get_value('ipHostNumber');
-        $mesg = $ldap->moddn($entry->dn(), newrdn => $newrdn);
+        my $cn = $entry->get_value('cn');
+        $cn =~ s/\$$//;
+        $entry->replace('cn' => $cn);
+        my $newrdn = "cn=".$cn;
+        my $dn_old = $entry->dn();
+        $dn_old =~ m/^[^,]+,.*$systemrdn,(.+)$/ or die "Could not parse dn ".$dn_old."\n";
+        my $entrybase = $1;
+        if (!branch_exists($ldap, "$workstationrdn,$entrybase")) {
+          if ($workstationrdn =~ m/^([^,]+),([^,]+)$/) {
+            if (!branch_exists($ldap, "$2,$entrybase")) {
+              create_branch($ldap, $entrybase, $2);
+            }
+            create_branch($ldap, "$2,$entrybase", $1);
+          } else {
+            create_branch($ldap, $entrybase, $workstationrdn);
+          }
+        }
+        my $dn_new = "$newrdn,$workstationrdn,$entrybase";
+        $entry->dn($dn_new);
+        my @replace = ('fdWorkstation');
+        my @classes = $entry->get_value('objectClass');
+        foreach my $class (@classes) {
+          if ($class ne 'account') {
+            push(@replace, "$class");
+          }
+        }
+        $entry->replace("objectClass" => \@replace);
+        $entry->add('fdMode' => 'unlocked');
+        $mesg = $ldap->add($entry);
+        if ($mesg->code) {
+          print $entry->dn().": ".$mesg->error."\n";
+          next;
+        }
+        undef @replace;
+        $mesg = $ldap->delete($dn_old);
         if ($mesg->code) {
           print $entry->dn().": ".$mesg->error."\n";
           next;
         }
+      }
+    }
+  } else {
+    print "Found no winstation to migrate\n";
+  }
+}
+
+# function that migrates phones from FD<1.1 to FD>=1.1
+sub migrate_phones {
+  # 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 => '(&(objectClass=fdPhone)(objectClass=device))',
+    base   => $base
+  );
+  $mesg->code && die $mesg->error;
+
+  if ($mesg->count > 0) {
+    print ("The following phones are still using the device objectClass:\n");
+
+    my @entries = $mesg->entries;
+
+    foreach my $entry (@entries) {
+      print $entry->dn()."\n";
+    }
+
+    if (ask_yn_question("Migrate these entries to fdPhone objectClass?")) {
+      foreach my $entry (@entries) {
+        my $tmprdn = "cn=".$entry->get_value('cn')."+objectClass=fdPhone";
+        my $newrdn = "cn=".$entry->get_value('cn');
         my $dn_old = $entry->dn();
-        $dn_old =~ s/^[^,]+,/$newrdn,/;
-        my @replace = ('ieee802Device', 'ipHost', 'fdPrinter');
+        my $dn_new = $entry->dn();
+        $dn_new =~ s/^[^,]+,/$tmprdn,/;
+        $entry->dn($dn_new);
+        my @replace = ();
         my @classes = $entry->get_value('objectClass');
         foreach my $class (@classes) {
-          if ($class ne 'gotoPrinter') {
+          if ($class ne 'device') {
             push(@replace, "$class");
           }
         }
@@ -1748,7 +1573,15 @@ sub migrate_printers {
         }
         undef @replace;
         $mesg = $ldap->delete($dn_old);
-        $mesg->code && print $dn_old.": ".$mesg->error."\n";
+        if ($mesg->code) {
+          print $entry->dn().": ".$mesg->error."\n";
+          next;
+        }
+        $mesg = $ldap->moddn($dn_new, newrdn => $newrdn);
+        if ($mesg->code) {
+          print $entry->dn().": ".$mesg->error."\n";
+          next;
+        }
       }
     }
   }
@@ -1826,7 +1659,7 @@ sub ldif_deprecated {
   my ($obsolete_attrs, $obsolete_classes) = get_deprecated();
 
   my $filterAttrs   = '(|'.join('', (map{ '('.$_->{'name'}.'=*)' } @$obsolete_attrs)).')';
-  my $filterClasses = '(|'.join('', (map{ '(objectClass='.$_->{'name'}.')' } (grep {$_ ne 'gosaAccount'} @$obsolete_classes))).')';
+  my $filterClasses = '(|'.join('', (map{ '(objectClass='.$_->{'name'}.')' } @$obsolete_classes)).')';
 
   # initiate the LDAP connexion
   my %hash_ldap_param = get_ldap_connexion();
@@ -1850,24 +1683,6 @@ sub ldif_deprecated {
           print "delete:".$attr->{'name'}."\n-\n";
         }
       }
-      my @classes = $entry->get_value('objectClass');
-      if (grep {$_ eq 'gosaAccount'} @classes) {
-        print "# Removing obsolete objectClass gosaAccount\n";
-        print "replace:objectClass\n";
-        foreach my $class (@classes) {
-          if ($class ne 'gosaAccount') {
-            print "objectClass:$class\n";
-          }
-        }
-        if (
-            ($entry->exists('dateOfBirth') || $entry->exists('personalTitle') || $entry->exists('gender'))
-            && !(grep {$_ eq 'fdPersonalInfo'} @classes)
-          ) {
-          print "objectClass:fdPersonalInfo\n";
-          print "# Adding fdPersonalInfo because either dateOfBirth, personalTitle or gender is present. See personal plugin.\n";
-        }
-        print "-\n";
-      }
       print "\n";
     }
   } else {
@@ -1881,7 +1696,7 @@ sub ldif_deprecated {
   $entries->code && die $entries->error;
 
   if ($entries->count > 0) {
-    print "# WARNING: There are entries in the LDAP using obsolete classes (other than gosaAccount), you need to edit them manually\n";
+    print "# WARNING: There are entries in the LDAP using obsolete classes, you need to edit them manually\n";
   } else {
     print "# There are no entries in the LDAP using obsolete classes\n";
   }
@@ -1918,6 +1733,9 @@ sub read_ldap_config {
     if (($mesg->entries)[0]->exists('fdDhcpRDN')) {
       $dhcprdn = ($mesg->entries)[0]->get_value('fdDhcpRDN');
     }
+    if (($mesg->entries)[0]->exists('fdWorkstationRDN')) {
+      $workstationrdn = ($mesg->entries)[0]->get_value('fdWorkstationRDN');
+    }
   }
 
   return ($mesg->entries)[0];
@@ -1954,17 +1772,15 @@ sub set_config_var {
 
 sub show_version {
   my $variables_common_path = "$vars{fd_home}/include/variables_common.inc";
-  my $vars_file;
-
   if (-e $variables_common_path) {
-    open($vars_file, q{<}, $variables_common_path) || die ("Could not open $variables_common_path");
-    while(<$vars_file>) {
+    open(my $vars, q{<}, $variables_common_path) || die ("Could not open $variables_common_path");
+    while(<$vars>) {
       if ($_ =~ m/^define \(["']FD_VERSION["'], "([^"]+)"\);/) {
         print "FusionDirectory version is $1\n";
         last;
       }
     }
-    close($vars_file);
+    close($vars);
   } else {
     print "File $variables_common_path does not exists, can’t find out FusionDirectory version\n";
   }
@@ -2009,10 +1825,10 @@ die ("! You have to run this script as root\n") if ($<!=0);
   $commands{"--check-ldap"}           = ["Checking your LDAP tree",                       \&check_ldap];
   $commands{"--check-ids"}            = ["Checking for duplicated uid or gid numbers",    \&check_id_numbers];
   $commands{"--migrate-users"}        = ["Migrating your users",                          \&migrate_users];
-  $commands{"--migrate-printers"}     = ["Migrating your printer from FD < 1.0.14",       \&migrate_printers];
-  $commands{"--migrate-dns"}          = ["Migrating DNS zones for FD 1.0.10",             \&migrate_dns];
+  $commands{"--migrate-phones"}       = ["Migrating your phones from FD < 1.1",           \&migrate_phones];
+  $commands{"--migrate-systems"}      = ["Migrating your systems from FD < 1.1",          \&migrate_systems];
+  $commands{"--migrate-winstations"}  = ["Migrating your winstations from FD < 1.1",      \&migrate_winstations];
   $commands{"--migrate-dhcp"}         = ["Migrating DHCP configurations for FD >= 1.0.17",\&migrate_dhcp];
-  $commands{"--migrate-acls"}         = ["Migrating your ACLs",                           \&migrate_acls];
   $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];
@@ -2083,7 +1899,7 @@ Some extra features allow you to install FusionDirectory's plugins, and change d
 
 =item --update-cache
 
-This option update the /var/cache/fusiondirectory/class.cache file. Wich contain PHP classes used in FusionDirectory, and their location.
+This option update the /var/cache/fusiondirectory/class.cache file. Which contain PHP classes used in FusionDirectory, and their location.
 
 =item --update-locales
 
@@ -2110,21 +1926,21 @@ This option check your LDAP tree for duplicated uidNumber or gidNumber among use
 
 This option add FusionDirectory attributes to the people branch.
 
-=item --migrate-printers
+=item --migrate-phones
 
-This option replace gosaPrinter objectClass by new fdPrinter objectClass.
+This option removes device objectClass for phones as fdPhones is now structural since FD 1.1.
 
-=item --migrate-dns
+=item --migrate-systems
 
-This option moves DNS zones from systems branch to DNS branch, which is necessary for FusionDirectory 1.0.10 and above.
+This option replace old systems objectClasses by new objectClasses from FD 1.1.
 
-=item --migrate-dhcp
+=item --migrate-winstations
 
-This option moves DHCP configurations from systems branch to DHCP branch, which is necessary for FusionDirectory 1.0.17 and above.
+This option replace old winstations objectClasses by new objectClasses from FD 1.1.
 
-=item --migrate-acls
+=item --migrate-dhcp
 
-This option will migrated old GOsa style acl from 1.0.7 into FusionDirectory acl roles in 1.0.8
+This option moves DHCP configurations from systems branch to DHCP branch, which is necessary for FusionDirectory 1.0.17 and above.
 
 =item --delete-gosa-locks
 
@@ -2164,7 +1980,7 @@ This option will list the dn of LDAP entries using deprecated attributes or obje
 
 =item --ldif-deprecated
 
-This option will print an LDIF to allow you to remove deprecated attributes from you ldap server. Be carefull and check before applying.
+This option will print an LDIF to allow you to remove deprecated attributes from you ldap server. Be careful and check before applying.
 
 =item --show-config
 
@@ -2225,7 +2041,7 @@ This code is part of FusionDirectory (http://www.fusiondirectory.org/)
 
 =over 2
 
-=item Copyright (C) 2011-2016  FusionDirectory
+=item Copyright (C) 2011-2017  FusionDirectory
 
 =back
 
diff --git a/contrib/docs/UPGRADE b/contrib/docs/UPGRADE
index dc7a735a6f0a95adfe70024479e004ef3d3cd844..852fc886824765caeb0193c9be33a55a6d4ce662 100644
--- a/contrib/docs/UPGRADE
+++ b/contrib/docs/UPGRADE
@@ -2718,8 +2718,167 @@ Checking your indexed attributes
 
 Check that all you index still match with valid attributes present in your ldap directory 
 
+Migrate FusionDirectory from 1.0.20 to 1.1
+==========================================
 
+Ubuntu 12.0.4 TLS users
+=======================
+ 
+FusionDirectory needs the php-cas library for CAS server support. This library can normally be found in universe in the Ubuntu repositories.
+
+In case you did not find it, grab the deb from there and install it:
+
+http://packages.ubuntu.com/trusty/all/php-cas/download
+
+and select your favorite mirror
+
+Removed plugins
+===============
+
+- If you used kolab2 plugin you need to remove the plugin and its schema with the following command
+
+apt-get remove fusiondirectory-plugin-kolab2
+apt-get remove fusiondirectory-plugin-kolab2-schema
+
+
+==== Upgrade schema2ldif ====
+
+For Jessie distribution add extra repository
+
+# fusiondirectory debian-extra repository
+deb http://repos.fusiondirectory.org/debian-extra jessie main
+
+- Update the package list and upgrade schema2ldif
+
+apt-get update
+apt-get install schema2ldif
+
+==== Upgrade FusionDirectory first ====
+
+- Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
+
+apt-get install fusiondirectory
+
+- Upgrade FusionDirectory schema package too.
+
+apt-get install fusiondirectory-schema
+
+==== Upgrade of LDAP directory ====
+
+- Upgrade the core schemas 
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/core-fd-conf.schema
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/core-fd.schema
+
+==== Upgrade of LDAP directory ====
+
+- if you are using the argonaut plugin you have to update its schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/argonaut-fd.schema
+
+- if you are using the dhcp plugin you have to update its schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/dhcp-fd.schema
+
+- if you are using the fai plugin you have to update its schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/fai.schema
+
+- if you are using the mail plugin you have to update its schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/mail-fd.schema
+
+- if you are using the systems plugin you have to update its schema
+
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/service-fd.schema
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/systems-fd-conf.schema
+fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/systems-fd.schema
+
+Migrate old objects
+===================
+
+- If you have systems use this command to migrate them
+
+fusiondirectory-setup --migrate-systems
+
+- If you have phones use this command to migrate them
+
+fusiondirectory-setup --migrate-phones
+
+- If you have winstations use this command to migrate them
+
+fusiondirectory-setup --migrate-winstations
+
+Check for deprecated attributes and objectClasses in your LDAP
+==============================================================
+
+The list-deprecated option of fusiondirectory-setup show deprecated attributes and objectClasses for FusionDirectory
 
+fusiondirectory-setup  --list-deprecated                                            
+List deprecated attributes and objectclasses
+Deprecated attributes:
+ fdRfc2307bis                  	(FusionDirectory - rfc2307bis)                              	- 1.3.6.1.4.1.38414.8.10.1
+ gosaDefaultPrinter            	(Defines a default printer a user owns)                     	- 1.3.6.1.4.1.10098.1.1.12.13
+ gosaUser                      	(GOsa - DN of a user)                                       	- 1.3.6.1.4.1.10098.1.1.12.2
+ gotoLogoffScript              	(GOto - specifies a LogoffScript)                           	- 1.3.6.1.4.1.10098.1.1.11.19
+ gotoSyslogServer              	(GOto - Gonicus Terminal Concept, value syslogServer.)      	- 1.3.6.1.4.1.10098.1.1.1.1
+ gotoHotplugDeviceDN           	(GOto - points to hotplug devices)                          	- 1.3.6.1.4.1.10098.1.1.11.18
+ argonautLdap2zoneAllowNotify  	(Fusion Directory - Argonaut, allow notify.)                	- 1.3.6.1.4.1.38414.2.13.2
+ fdAccountRDN                  	(FusionDirectory - use a placeholder pattern for generating account RDNs)	- 1.3.6.1.4.1.38414.8.12.2
+ fdMailMethod                  	(FusionDirectory - Mail method)                             	- 1.3.6.1.4.1.38414.10.10.1
+ fdPrimaryGroupFilter          	(FusionDirectory - Primary group filter)                    	- 1.3.6.1.4.1.38414.8.14.1
+ fdPasswordHook                	(FusionDirectory - Password hook (external command))        	- 1.3.6.1.4.1.38414.8.13.4
+ fdCopyPaste                   	(FusionDirectory - (de)Activate copy/paste)                 	- 1.3.6.1.4.1.38414.8.14.5
+ fdIdGenerator                 	(FusionDirectory - An automatic way to generate new user ids)	- 1.3.6.1.4.1.38414.8.12.4
+ fdPersonalTitleInDN           	(FusionDirectory - Personal title in dn)                    	- 1.3.6.1.4.1.38414.8.12.5
+ fdSnapshotAdminPassword       	(FusionDirectory - Snaphost admin password)                 	- 1.3.6.1.4.1.38414.8.17.5
+ gotoLogonScript               	(GOto - specifies a LogonScript)                            	- 1.3.6.1.4.1.10098.1.1.11.10
+ gotoMode                      	(GOto - Gonicus Terminal Concept, Terminal is active.)      	- 1.3.6.1.4.1.10098.1.1.1.24
+ fdSnapshotURI                 	(FusionDirectory - Snaphost URI)                            	- 1.3.6.1.4.1.38414.8.17.3
+ fdSnapshotAdminDn             	(FusionDirectory - Snaphost admin dn)                       	- 1.3.6.1.4.1.38414.8.17.4
+ gotoHotplugDevice             	(GOto - keeps hotplug devices)                              	- 1.3.6.1.4.1.10098.1.1.11.14
+ gosaObject                    	(GOsa - DN of an object)                                    	- 1.3.6.1.4.1.10098.1.1.12.3
+ gotoLdapServer                	(LDAP server to use)                                        	- 1.3.6.1.4.1.10098.1.1.1.38
+Deprecated objectClasses:
+ gotoTerminalTemplate          	(GOto - Gonicus Terminal Concept, objectclass)              	- 1.3.6.1.4.1.10098.1.2.1.35
+ gotoEnvironment               	(GOto - contains environment settings)                      	- 1.3.6.1.4.1.10098.1.2.1.32
+ gosaLockEntry                 	(GOsa - Class for GOsa locking)                             	- 1.3.6.1.4.1.10098.1.2.1.19.2
+ goServer                      	(Server description)                                        	- 1.3.6.1.4.1.10098.1.2.1.27
+ GOhard                        	(Gonicus Hardware definitions, objectclass)                 	- 1.3.6.1.4.1.10098.1.2.1.3
+ fdAsteriskPluginConf          	(FusionDirectory asterisk plugin configuration)             	- 1.3.6.1.4.1.38414.19.2.1
+ gotoDevice                    	(GOto - contains environment settings)                      	- 1.3.6.1.4.1.10098.1.2.1.42
+ gotoWorkstation               	(GOto - Gonicus Terminal Concept, objectclass)              	- 1.3.6.1.4.1.10098.1.2.1.30
+ gosaUserTemplate              	(GOsa - Class for GOsa User Templates)                      	- 1.3.6.1.4.1.10098.1.2.1.19.11
+ gotoPrinter                   	(GOto - Gonicus Terminal Concept, objectclass)              	- 1.3.6.1.4.1.10098.1.2.1.31
+ gotoTerminal                  	(GOto - Gonicus Terminal Concept, objectclass)              	- 1.3.6.1.4.1.10098.1.2.1.1
+ gotoWorkstationTemplate       	(GOto - Gonicus Terminal Concept, objectclass)              	- 1.3.6.1.4.1.10098.1.2.1.34
+
+The check-deprecated option will output a list of dn using old attributes and objectClasses of they are present in your ldap server
+
+fusiondirectory-setup --check-deprecated
+List LDAP entries using deprecated attributes or objectclasses
+There are no entries in the LDAP using obsolete attributes
+There are no entries in the LDAP using obsolete classes
+
+The ldif-deprecated option will output an ldif file on the console that you can use with ldapmodify to clean you ldap server from old attributes.
+
+fusiondirectory-setup --ldif-deprecated > remove_deprecated.ldif
+
+If they are old objectClasses it will warn you and you will have to remove them by hand, they have been specified at the check-deprecated step.
+
+Please read it carefully before applying :!::!:
+
+
+==== Checking your indexed attributes ====
+
+Check that all you index still match with valid attributes present in your ldap directory 
+
+==== New format for repository service  ====
+
+If you have a repository service.
+Open and save it back so it will use the new format
+
+Enjoy :)
 
 ---
 * Further information
diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index 2f0c5152ca86cb238294f544a3fdf0f077a5be0c..ece71741be7ae9778ecfc13f20bdc231825d5db6 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-23" "FusionDirectory 1.0.20" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-04-26" "FusionDirectory 1.1" "FusionDirectory Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -142,10 +142,10 @@
 fusiondirectory\-insert\-schema \- insert schema needed by FusionDirectory into the ldap server
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-fusiondirectory-insert-schema [<path of your schema files>] [\-l] [\-i|\-m schema1 schema2]
+fusiondirectory-insert-schema [\-y] [\-n] [\-c] [\-o options] [path] [\-h|\-l|\-i schema1 schema2|\-m schema1 schema2|\-e schema1 schema2]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-This program will insert the schema needed by FusionDirectory into the ldap server
+This program will insert the schema needed by FusionDirectory into the ldap server, or the specified schemas
 .SS "Options"
 .IX Subsection "Options"
 .IP "\-i" 6
@@ -208,8 +208,8 @@ Come Bernigaud
 .SH "LICENCE AND COPYRIGHT"
 .IX Header "LICENCE AND COPYRIGHT"
 This code is part of FusionDirectory <http://www.fusiondirectory.org>
-.IP "Copyright (C) 2011\-2016 FusionDirectory Project" 1
-.IX Item "Copyright (C) 2011-2016 FusionDirectory Project"
+.IP "Copyright (C) 2011\-2017 FusionDirectory Project" 1
+.IX Item "Copyright (C) 2011-2017 FusionDirectory Project"
 .PP
 This program is distributed in the hope that it will be useful,
 but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index e73902fc6c3ea4d5a18394653d3f532e0ff78267..12d6c1d863113abc0c4f1786f8c4cca25f378307 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY-SETUP 1"
-.TH FUSIONDIRECTORY-SETUP 1 "2017-03-29" "FusionDirectory 1.0.20" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2017-05-03" "FusionDirectory 1.1" "FusionDirectory Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -148,7 +148,7 @@ Some extra features allow you to install FusionDirectory's plugins, and change d
 .IX Subsection "Options"
 .IP "\-\-update\-cache" 4
 .IX Item "--update-cache"
-This option update the /var/cache/fusiondirectory/class.cache file. Wich contain \s-1PHP\s0 classes used in FusionDirectory, and their location.
+This option update the /var/cache/fusiondirectory/class.cache file. Which contain \s-1PHP\s0 classes used in FusionDirectory, and their location.
 .IP "\-\-update\-locales" 4
 .IX Item "--update-locales"
 This option update internalization, by generating a new .mo locales file for each language, with every .po files it found.
@@ -168,18 +168,18 @@ This option check your \s-1LDAP\s0 tree for duplicated uidNumber or gidNumber am
 .IP "\-\-migrate\-users" 4
 .IX Item "--migrate-users"
 This option add FusionDirectory attributes to the people branch.
-.IP "\-\-migrate\-printers" 4
-.IX Item "--migrate-printers"
-This option replace gosaPrinter objectClass by new fdPrinter objectClass.
-.IP "\-\-migrate\-dns" 4
-.IX Item "--migrate-dns"
-This option moves \s-1DNS\s0 zones from systems branch to \s-1DNS\s0 branch, which is necessary for FusionDirectory 1.0.10 and above.
+.IP "\-\-migrate\-phones" 4
+.IX Item "--migrate-phones"
+This option removes device objectClass for phones as fdPhones is now structural since \s-1FD 1.1.\s0
+.IP "\-\-migrate\-systems" 4
+.IX Item "--migrate-systems"
+This option replace old systems objectClasses by new objectClasses from \s-1FD 1.1.\s0
+.IP "\-\-migrate\-winstations" 4
+.IX Item "--migrate-winstations"
+This option replace old winstations objectClasses by new objectClasses from \s-1FD 1.1.\s0
 .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\-acls" 4
-.IX Item "--migrate-acls"
-This option will migrated old GOsa style acl from 1.0.7 into FusionDirectory acl roles in 1.0.8
 .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
@@ -209,7 +209,7 @@ This option will list the deprecated attributes and objectclasses still in your
 This option will list the dn of \s-1LDAP\s0 entries using deprecated attributes or objectclasses and no longer used by FusionDirectory.
 .IP "\-\-ldif\-deprecated" 4
 .IX Item "--ldif-deprecated"
-This option will print an \s-1LDIF\s0 to allow you to remove deprecated attributes from you ldap server. Be carefull and check before applying.
+This option will print an \s-1LDIF\s0 to allow you to remove deprecated attributes from you ldap server. Be careful and check before applying.
 .IP "\-\-show\-config" 4
 .IX Item "--show-config"
 This option will print a dump of the FusionDirectory configuration \s-1LDAP\s0 node.
@@ -260,8 +260,8 @@ Come Bernigaud
 .SH "LICENCE AND COPYRIGHT"
 .IX Header "LICENCE AND COPYRIGHT"
 This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-.IP "Copyright (C) 2011\-2016  FusionDirectory" 2
-.IX Item "Copyright (C) 2011-2016 FusionDirectory"
+.IP "Copyright (C) 2011\-2017  FusionDirectory" 2
+.IX Item "Copyright (C) 2011-2017 FusionDirectory"
 .PP
 This program is distributed in the hope that it will be useful,
 but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 4b2e1698d3e81550ed53e67799ac9c44e73a4611..e4ca2dcf9d1ba3e03cc7874542dc24500dc56989 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY.CONF 1"
-.TH FUSIONDIRECTORY.CONF 1 "2017-03-29" "FusionDirectory 1.0.20" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2017-05-03" "FusionDirectory 1.1" "FusionDirectory Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -205,11 +205,11 @@ The templateCompileDirectory statements defines the path, where the \s-1PHP\s0 t
 This path needs to be writeable by the user your webserver is running with.
 .IP "\fBignoreAcl\fR \fIdn\fR" 4
 .IX Item "ignoreAcl dn"
-The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidently dropped ACLs.
+The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidentally dropped ACLs.
 .IP "\fBdisplayerrors\fR bool" 4
 .IX Item "displayerrors bool"
 The  displayerrors  statement tells FusionDirectory to show \s-1PHP\s0 errors in the upper part of the screen. This should be disabled in productive deployments, because there
-might be some important passwords arround.
+might be some important passwords around.
 .SS "Location section options"
 .IX Subsection "Location section options"
 .IP "\fBname\fR \fIstring\fR" 4
@@ -272,8 +272,8 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
 .IP "Copyright (C) 2003\-2010 \s-1GONICUS\s0 GmbH" 2
 .IX Item "Copyright (C) 2003-2010 GONICUS GmbH"
 .PD 0
-.IP "Copyright (C) 2011\-2016 FusionDirectory project" 2
-.IX Item "Copyright (C) 2011-2016 FusionDirectory project"
+.IP "Copyright (C) 2011\-2017 FusionDirectory project" 2
+.IX Item "Copyright (C) 2011-2017 FusionDirectory project"
 .PD
 .PP
 This program is distributed in the hope that it will be useful, but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the \s-1GNU\s0 General Public License for more details.
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index a4d657dd9fd909ca07945eba1b09ed9671e90f57..77cb1abb089d7d933ca31f7ae4bdc077c9423b21 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -71,12 +71,12 @@ This path needs to be writeable by the user your webserver is running with.
 
 =item B<ignoreAcl> I<dn>
 
-The ignoreAcl value tells FusionDirectory to ignore complete ACL sets for the given DN. Add your DN here and you'll be able to restore accidently dropped ACLs.
+The ignoreAcl value tells FusionDirectory to ignore complete ACL sets for the given DN. Add your DN here and you'll be able to restore accidentally dropped ACLs.
 
 =item B<displayerrors> bool
 
 The  displayerrors  statement tells FusionDirectory to show PHP errors in the upper part of the screen. This should be disabled in productive deployments, because there
-might be some important passwords arround.
+might be some important passwords around.
 
 =back
 
@@ -157,7 +157,7 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
 
 =item Copyright (C) 2003-2010 GONICUS GmbH
 
-=item Copyright (C) 2011-2016 FusionDirectory project
+=item Copyright (C) 2011-2017 FusionDirectory project
 
 =back
 
diff --git a/contrib/openldap/core-fd-conf.schema b/contrib/openldap/core-fd-conf.schema
index 88d151570d0a89296d35c47e8f4f5859c71aa44e..b2831c699bb00042a92a113ffb5cdff245ca5779 100644
--- a/contrib/openldap/core-fd-conf.schema
+++ b/contrib/openldap/core-fd-conf.schema
@@ -8,13 +8,6 @@
 
 # Schema setup
 
-attributetype ( 1.3.6.1.4.1.38414.8.10.1 NAME 'fdRfc2307bis'
-  DESC 'FusionDirectory - rfc2307bis'
-  OBSOLETE
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.8.10.2 NAME 'fdSchemaCheck'
   DESC 'FusionDirectory - Schema check'
   EQUALITY booleanMatch
@@ -53,14 +46,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.12.1 NAME 'fdAccountPrimaryAttribute'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.38414.8.12.2 NAME 'fdAccountRDN'
-  DESC 'FusionDirectory - use a placeholder pattern for generating account RDNs'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
 attributetype ( 1.3.6.1.4.1.38414.8.12.3 NAME 'fdNextIdHook'
   DESC 'FusionDirectory - A script to be called for finding the next free id for users or groups'
   EQUALITY caseExactIA5Match
@@ -68,21 +53,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.12.3 NAME 'fdNextIdHook'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.38414.8.12.4 NAME 'fdIdGenerator'
-  DESC 'FusionDirectory - An automatic way to generate new user ids'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.38414.8.12.5 NAME 'fdPersonalTitleInDN'
-  OBSOLETE
-  DESC 'FusionDirectory - Personal title in dn'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.8.12.6 NAME 'fdStrictNamingRules'
   DESC 'FusionDirectory - Strict naming rules'
   EQUALITY booleanMatch
@@ -172,6 +142,19 @@ attributetype ( 1.3.6.1.4.1.38414.8.12.19 NAME 'fdRestrictRoleMembers'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.38414.8.12.20 NAME 'fdSplitPostalAddress'
+  DESC 'FusionDirectory - Expose street, postOfficeBox and postalCode fields instead of postalAddress'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.38414.8.12.21 NAME 'fdPostalAddressPattern'
+  DESC 'FusionDirectory - When using separate address fields, you can use a pattern to fill postalAddress field'
+  EQUALITY caseExactIA5Match
+  SUBSTR caseExactIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
 # Password
 
 attributetype ( 1.3.6.1.4.1.38414.8.13.1 NAME 'fdPasswordDefaultHash'
@@ -193,14 +176,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.13.3 NAME 'fdPasswordMinDiffer'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.38414.8.13.4 NAME 'fdPasswordHook'
-  DESC 'FusionDirectory - Password hook (external command)'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
 attributetype ( 1.3.6.1.4.1.38414.8.13.5 NAME 'fdHandleExpiredAccounts'
   DESC 'FusionDirectory - Handle expired accounts'
   EQUALITY booleanMatch
@@ -229,13 +204,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.13.8 NAME 'fdForcePasswordDefaultHash'
 
 # Core settings
 
-attributetype ( 1.3.6.1.4.1.38414.8.14.1 NAME 'fdPrimaryGroupFilter'
-  DESC 'FusionDirectory - Primary group filter'
-  OBSOLETE
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.8.14.2 NAME 'fdListSummary'
   DESC 'FusionDirectory - Show list summary'
   EQUALITY booleanMatch
@@ -249,13 +217,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.14.4 NAME 'fdModificationDetectionAttribute'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.38414.8.14.5 NAME 'fdCopyPaste'
-  DESC 'FusionDirectory - (de)Activate copy/paste'
-  OBSOLETE
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.8.14.6 NAME 'fdLogging'
   DESC 'FusionDirectory - Logging'
   EQUALITY booleanMatch
@@ -361,30 +322,6 @@ attributetype ( 1.3.6.1.4.1.38414.8.17.2 NAME 'fdSnapshotBase'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.38414.8.17.3 NAME 'fdSnapshotURI'
-  DESC 'FusionDirectory - Snaphost URI'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.38414.8.17.4 NAME 'fdSnapshotAdminDn'
-  DESC 'FusionDirectory - Snaphost admin dn'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.38414.8.17.5 NAME 'fdSnapshotAdminPassword'
-  DESC 'FusionDirectory - Snaphost admin password'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
 # Miscellaneous
 
 attributetype ( 1.3.6.1.4.1.38414.8.18.2 NAME 'fdTabHook'
@@ -430,6 +367,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.18.8 NAME 'fdDefaultShell'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
+attributetype ( 1.3.6.1.4.1.38414.8.18.9 NAME 'fdPluginsMenuBlacklist'
+  DESC 'FusionDirectory - Blacklist as groupdn|plugin or roledn|plugin'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
 # Plugins
 
 attributetype ( 1.3.6.1.4.1.38414.8.19.1 NAME 'fdOGroupRDN'
@@ -596,24 +539,23 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
     fusionConfigMd5 $
     fdSchemaCheck $
     fdLanguage $ fdTheme $ fdTimezone $
-    fdAccountPrimaryAttribute $ fdNextIdHook $ fdIdGenerator $
+    fdAccountPrimaryAttribute $ fdNextIdHook $
     fdStrictNamingRules $ fdMinId $ fdUidNumberBase $
     fdGidNumberBase $ fdUserRDN $ fdGroupRDN $ fdIdAllocationMethod $
     fdGidNumberPoolMin $ fdUidNumberPoolMin $ fdGidNumberPoolMax $ fdUidNumberPoolMax $
-    fdAclRoleRDN $ fdCnPattern $ fdRestrictRoleMembers $
+    fdAclRoleRDN $ fdCnPattern $ fdRestrictRoleMembers $ fdSplitPostalAddress $ fdPostalAddressPattern $
     fdPasswordDefaultHash $ fdPasswordMinLength $ fdPasswordMinDiffer $
-    fdPasswordHook $ fdHandleExpiredAccounts $ fdSaslRealm $ fdSaslExop $
+    fdHandleExpiredAccounts $ fdSaslRealm $ fdSaslExop $
     fdForcePasswordDefaultHash $
-    fdPrimaryGroupFilter $ fdListSummary $
+    fdListSummary $
     fdModificationDetectionAttribute $ fdLogging $ fdLdapSizeLimit $
     fdLoginAttribute $ fdForceSSL $ fdWarnSSL $ fdStoreFilterSettings $ fdSessionLifeTime $
     fdHttpAuthActivated $ fdHttpHeaderAuthActivated $ fdHttpHeaderAuthHeaderName $
     fdDisplayErrors $ fdLdapMaxQueryTime $ fdLdapStats $ fdDebugLevel $
     fdEnableSnapshots $ fdSnapshotBase $
     fdTabHook $ fdShells $ fdDefaultShell $ fdDisplayHookOutput $
+    fdPluginsMenuBlacklist $
     fdAclTabOnObjects $ fdDepartmentCategories $
-    fdRfc2307bis $ fdCopyPaste $ fdSnapshotURI $
-    fdSnapshotAdminDn $ fdSnapshotAdminPassword $ fdPersonalTitleInDN $ fdAccountRDN $
     fdSslCaCertPath $ fdSslKeyPath $ fdSslCertPath $
     fdCasActivated $ fdCasServerCaCertPath $ fdCasHost $ fdCasPort $ fdCasContext
   ) )
diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 79cf932cd47ea5d1eb542cd292f1d8a72100acab..4f293d4da29757021b9c80af8e101716b4a1cd49 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -83,11 +83,6 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIA
   MUST  ( ou $ description )
   MAY   ( manager $ co $ labeledURI ) )
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY
-  DESC 'GOsa - Class for GOsa User Templates'
-  OBSOLETE
-  MUST ( cn ))
-
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames'
   DESC 'GOsa - Adds the gosaGroupObjects field to groupOfNames'
   SUP top AUXILIARY
@@ -113,4 +108,3 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
 objectclass ( 1.3.6.1.4.1.38414.62.2.1 NAME 'fdLockEntry' SUP top STRUCTURAL
   DESC 'GOsa - Class for FD locking'
   MUST ( fdUserDn $ fdObjectDn $ cn $ fdLockTimestamp ))
-
diff --git a/contrib/smarty/plugins/block.render.php b/contrib/smarty/plugins/block.render.php
index f47fabd5fe4f29803a4df6ae8e9aa8756611da2b..b8308571fc4a0fc5dad88cbe6f8f9b3c143e6f7d 100644
--- a/contrib/smarty/plugins/block.render.php
+++ b/contrib/smarty/plugins/block.render.php
@@ -18,127 +18,67 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
+
 function smarty_block_render($params, $text, &$smarty)
 {
   /* Skip closing tag </render> */
-  if(empty($text)) {
-    return("");
+  if (empty($text)) {
+    return '';
   }
 
   /* Get acl parameter */
-  $acl = "";
+  $acl = '';
   if (isset($params['acl'])) {
     $acl = $params['acl'];
   }
 
   /* Debug output */
-  if (session::is_set('DEBUGLEVEL') && session::get('DEBUGLEVEL') & DEBUG_ACL ){
-    echo "<div style='color:blue;font-size:2;'>&nbsp;".$acl."</div>";
-  }
-
-
-
-  /* Parameter : checkbox, checked
-     *  If the parameter 'checkbox' is given, we create a html checkbox in front
-     *   of the current object.
-     *  The parameter 'checked' specifies whether the box is checked or not.
-     *  The checkbox disables or enables the current object.
-     */
-  if(isset($params['checkbox']) && $params['checkbox']){
-
-    /* Detect name and id of the current object */
-    $use_text = preg_replace("/\n/"," ",$text);
-    $name = preg_replace('/^.* name[ ]*=[ ]*("|\')([^\"\' ]*).*$/i',"\\2",$use_text);
-
-    /* Detect id */
-    if(preg_match("/ id=(\"|')[^\"']*(\"|')/i",$text)){
-      $id = preg_replace('/^.* id[ ]*=[ ]*("|\')([^\"\' ]*).*$/i',"\\2",$use_text);
-    }else{
-      $id = "";
-    }
-
-    /* Is the box checked? */
-    isset($params['checked'])&&$params['checked'] ? $check = " checked " : $check = "";
-
-    /* If name isset, we have a html input field */
-    if(!empty($name)){
-
-      /* Print checkbox */
-      echo "<input type='checkbox' name='use_".$name."' ".$check."
-          onClick=\"changeState('".$name."');\" class='center'>";
-
-      /* Disable current object, if checkbox isn't checked */
-      if($check == ""){
-        $text = preg_replace("/name=/i"," disabled name=",$text);
-      }
-
-      /* Add id to current entry, if it is missing */
-      if($id == ""){
-        $text = preg_replace("/name=/i"," id=\"".$name."\" name=",$text);
-      }
-    }
+  if (session::is_set('DEBUGLEVEL') && session::get('DEBUGLEVEL') & DEBUG_ACL ) {
+    echo '<div style="color:blue;">'.$acl.(isset($params['aclName']) ? ' ['.$params['aclName'].']' : '').'</div>';
   }
 
-
   /* Read / Write*/
-  if(preg_match("/w/i",$acl)){
-    return ($text);
+  if (preg_match('/w/i', $acl)) {
+    return $text;
   }
 
-  $text = preg_replace ("/\n/","GOSA_LINE_BREAK",$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))){
-
-    /* Disable options && greyout divlists */
-    $from   = array("/class=['\"]list1nohighlight['\"]/i",
-        "/class=['\"]list0['\"]/i",
-        "/class=['\"]list1['\"]/i",
-        "/class=['\"]sortableListItem[^'\"]*['\"]/i");
-    $to   = array("class='list1nohighlightdisabled'",
-        "class='list1nohighlightdisabled'",
-        "class='list1nohighlightdisabled'",
-        "class='sortableListItemDisabled'");
-
-    if(!preg_match('/ disabled(="disabled")?( |\/?>)/', $text)){
-      $from [] = "/name=/i" ;
-      $to   [] = "disabled name=";
-    }
-
-    $text   = preg_replace($from,$to,$text);
-
-    /* Replace picture if object is disabled */
-    if(isset($params['disable_picture'])){
-      $syn = "/src=['\"][^\"']*['\"]/i";
-      $new = "src=\"".$params['disable_picture']."\"";
-      $text = preg_replace($syn,$new,$text);
+  if (!(isset($params['mode']) && ($params['mode'] == 'read_active') && preg_match('/(r|w)/', $acl))) {
+    if (!preg_match('/ disabled(="disabled")?( |\/?>)/', $text)) {
+      $text = preg_replace('/name=/i', 'disabled="disabled" name=', $text);
     }
   }
 
   /* Read only */
-  if(preg_match("/r/i",$acl)){
-    return(preg_replace("/GOSA_LINE_BREAK/","\n",$text));
+  if (preg_match('/r/i', $acl)) {
+    return preg_replace('/GOSA_LINE_BREAK/', "\n", $text);
   }
 
   /* No acls */
-  if(preg_match("/type['\"= ].*submit/",$text)){
-    $text = preg_replace("/submit/","button",$text);
-  }else{
-    $text = preg_replace("/value=['\"][^\"']*['\"]/","",$text);
+  if (preg_match('/type[\'"= ].*submit/', $text)) {
+    $text = preg_replace('/submit/', 'button', $text);
+  } else {
+    $text = preg_replace('/value=[\'"][^"\']*[\'"]/', '', $text);
   }
 
   /* Remove select options */
-  $from   = array("#<option.*<\/option>#i",
-      "/(<textarea.*>).*(<\/textarea>)/i",
-      "/^(.*<input.*)checked(.*>.*)$/i");
+  $from = array(
+    "#<option.*<\/option>#i",
+    "/(<textarea.*>).*(<\/textarea>)/i",
+    "/^(.*<input.*)checked(.*>.*)$/i"
+  );
 
-  $to   = array(" ",
-      "\\1\\2",
-      "\\1 \\2");
-  $text   = preg_replace($from,$to,$text);
-  $text = preg_replace("/GOSA_LINE_BREAK/","\n",$text);
+  $to = array(
+    " ",
+    "\\1\\2",
+    "\\1 \\2"
+  );
+
+  $text = preg_replace($from, $to, $text);
+  $text = preg_replace('/GOSA_LINE_BREAK/', "\n", $text);
 
   return $text;
 }
-
 ?>
diff --git a/contrib/smarty/plugins/function.msgPool.php b/contrib/smarty/plugins/function.msgPool.php
index a50542ecc197be40e4e97714306ce733ddf11ede..69945cc6ab1473592479755e94d9ee614c534665 100644
--- a/contrib/smarty/plugins/function.msgPool.php
+++ b/contrib/smarty/plugins/function.msgPool.php
@@ -20,20 +20,20 @@
 */
 function smarty_function_msgPool($params, &$smarty)
 {
-  if(class_available("msgPool") && isset($params['type'])){
+  if (class_available('msgPool') && isset($params['type'])) {
     $parameter = array();
-    foreach($params as $para => $value){
-      if(!preg_match("/^type$/i",$para)){
+    foreach ($params as $para => $value) {
+      if (!preg_match('/^type$/i', $para)) {
         $parameter[$para] = $value;
       }
     }
-    if(is_callable("msgPool::".$params['type'])){
-      echo call_user_func_array(array("msgPool",$params['type']), $parameter);
-    }else{
-      trigger_error("Unknown msgPool function ".$params['type']);
+    if (is_callable('msgPool::'.$params['type'])) {
+      echo call_user_func_array(array('msgPool',$params['type']), $parameter);
+    } else {
+      trigger_error('Unknown msgPool function '.$params['type']);
     }
-  }else{
-    trigger_error("Unknown class msgPool.");
+  } else {
+    trigger_error('Unknown class msgPool.');
   }
 }
 ?>
diff --git a/html/autocomplete.php b/html/autocomplete.php
index 430e3e5f746699aec3983e0682b612f30b6a4073..11d657069e91528faa6db767d8c85d9640c1bde1 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -72,10 +72,11 @@ if (isset($_GET['type']) && $_GET['type'] == "base") {
 } else {
 
   $ui = session::global_get('ui');
+  $config = session::global_get('config');
 
   /* Is there a filter object arround? */
-  if (session::is_set("autocomplete")) {
-    $filter = session::get("autocomplete");
+  if (session::is_set('autocomplete')) {
+    $filter = session::get('autocomplete');
     $filter->processAutocomplete();
   }
 }
diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index d120f845842822a48c07b27cc7402f5af1051470..feaee126428558199f0ea735af9c130479985cd6 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -619,14 +619,13 @@ class passwordRecovery extends standAlonePage {
     );
 
     /* Is there any problem with entered passwords? */
-    $error = $userTabs->check();
-    if (!empty($error)) {
-      $this->message = $error;
-      return FALSE;
+    $userTabs->save_object();
+    $errors = $userTabs->save();
+    if (!empty($errors)) {
+      $this->message = $errors;
+      return;
     }
 
-    $userTabs->save_object();
-    $userTabs->save();
     fusiondirectory_log('User '.$this->login.' password has been changed');
 
     return TRUE;
diff --git a/html/getbin.php b/html/getbin.php
index be08b95f36e991dd4ae631d35324294d33a54bfa..40c472ff4de83914a113d369368167ee649339ef 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -20,12 +20,12 @@
 */
 
 /* Basic setup, remove eventually registered sessions */
-@require_once("../include/php_setup.inc");
-@require_once("functions.inc");
-@require_once("variables.inc");
+@require_once('../include/php_setup.inc');
+@require_once('functions.inc');
+@require_once('variables.inc');
 
 error_reporting (0);
-session_cache_limiter("private");
+session_cache_limiter('private');
 session::start();
 session::global_set('errorsAlreadyPosted', array());
 
@@ -36,23 +36,21 @@ if (!session::global_is_set('ui')) {
   exit;
 }
 
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-header("Cache-Control: no-cache");
-header("Pragma: no-cache");
-header("Cache-Control: post-check=0, pre-check=0");
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+header('Cache-Control: no-cache');
+header('Pragma: no-cache');
+header('Cache-Control: post-check=0, pre-check=0');
 
 $key = 'binary';
 if (isset ($_GET['key'])) {
   $key .= $_GET['key'];
 }
 
-$bintype = session::is_set($key.'type')
-  ? session::get($key.'type') : "octet-stream";
-header("Content-type: " . $bintype);
+$bintype = (session::is_set($key.'type') ? session::get($key.'type') : 'octet-stream');
+header('Content-type: '.$bintype);
 if (session::is_set($key.'file')) {
-  header( 'Content-disposition: attachment; filename="'
-    . session::get($key.'file')).'"';
+  header('Content-disposition: attachment; filename="'.session::get($key.'file').'"');
 }
 
 echo session::get($key);
diff --git a/html/geticon.php b/html/geticon.php
index 2c7c7c419bbe9f0ae07a2fcf3a24cad05fae7f8e..334d254d952bb4c72467c98e6ee2b50076fb7034 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -34,7 +34,6 @@ if (session::global_is_set('config')) {
 } else {
   header("cache-control: no-cache");
 }
-IconTheme::$default_theme = 'breezy';
 IconTheme::$extensions    = array('png');
 if (!isset($_GET['context']) || !isset($_GET['icon']) || !isset($_GET['size'])) {
   trigger_error('Missing information in query string: '.$_SERVER['QUERY_STRING']);
diff --git a/html/include/pulldown.js b/html/include/pulldown.js
index fc5637791167ed3e9d1910ca05bb7e26005dd338..67bc6c612d934f754f1aa9755e0ed13088487abc 100644
--- a/html/include/pulldown.js
+++ b/html/include/pulldown.js
@@ -71,12 +71,13 @@ MenuContainer.prototype = {
     this.id = this.element.id;
 
     if (this.type === "menuContainer") {
-      if (this.element.hasClassName("level1"))
+      if (this.element.hasClassName("level1")) {
         this.menuType = "horizontal";
-      else if (this.element.hasClassName("level2"))
+      } else if (this.element.hasClassName("level2")) {
         this.menuType = "dropdown";
-      else
+      } else {
         this.menuType = "flyout";
+      }
 
       if (this.menuType === "flyout" || this.menuType === "dropdown") {
         this.isOpen = false;
@@ -97,7 +98,7 @@ MenuContainer.prototype = {
     if (childNodes === null) {
       return;
     }
-    
+
     for (var i = 0; i < childNodes.length; i++) {
       var node = childNodes[i];
       if (node.nodeType === 1) {
@@ -119,12 +120,13 @@ MenuContainer.prototype = {
     var result = {};
     var value;
     for (var i = 0; i < ltrb.length; ++i) {
-      if (this.element.currentStyle)
+      if (this.element.currentStyle) {
         value = parseInt(this.element.currentStyle["border"+ltrb[i]+"Width"]);
-      else if (window.getComputedStyle)
+      } else if (window.getComputedStyle) {
         value = parseInt(window.getComputedStyle(this.element, "").getPropertyValue("border-"+ltrb[i].toLowerCase()+"-width"));
-      else
+      } else {
         value = parseInt(this.element.style["border"+ltrb[i]]);
+      }
       result[ltrb[i].toLowerCase()] = isNaN(value) ? 0 : value;
     }
     return result;
@@ -205,7 +207,6 @@ Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
         if (menuItem.root.openDelayTimer) {
           window.clearTimeout(menuItem.root.openDelayTimer);
         }
-        
         if (menuItem.root.closeDelayTimer) {
           window.clearTimeout(menuItem.root.closeDelayTimer);
         }
diff --git a/html/index.php b/html/index.php
index 65165dcadd6390e28e2174e56f12abd1acda3c80..668af40a7cbe17d0512a4930078922754abf4777 100644
--- a/html/index.php
+++ b/html/index.php
@@ -325,6 +325,9 @@ class Index {
     session::global_un_set('plist');
     $plist = load_plist();
 
+    /* Check that newly installed plugins have their configuration in the LDAP (will reload plist if needed) */
+    $config->checkLdapConfig();
+
     /* Check account expiration */
     if ($config->get_cfg_value('handleExpiredAccounts') == 'TRUE') {
       $expired = $ui->expired_status();
@@ -346,8 +349,6 @@ class Index {
     /* Not account expired or password forced change go to main page */
     logging::log('security', 'login', '', array(), 'User "'.static::$username.'" logged in successfully.');
     session::global_set('connected', 1);
-    // check that newly installed plugins have their configuration in the LDAP
-    $config->checkLdapConfig();
     session::global_set('DEBUGLEVEL', $config->get_cfg_value('DEBUGLEVEL'));
     header ('Location: main.php?global_check=1');
     exit;
@@ -393,9 +394,9 @@ class Index {
     $success = static::runSteps(array(
       'validateUserInput',
       'ldapLoginUser',
+      'checkForLockingBranch',
       'loginAndCheckExpired',
       'runSchemaCheck',
-      'checkForLockingBranch',
     ));
 
     if ($success) {
@@ -421,9 +422,9 @@ class Index {
     $success = static::runSteps(array(
       'validateUserInput',
       'ldapLoginUser',
+      'checkForLockingBranch',
       'loginAndCheckExpired',
       'runSchemaCheck',
-      'checkForLockingBranch',
     ));
 
     if ($success) {
@@ -460,16 +461,9 @@ class Index {
       exit();
     }
 
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $verify_attr = explode(',', $config->get_cfg_value('loginAttribute', 'uid'));
-    $filter = '';
-    foreach ($verify_attr as $attr) {
-      $filter .= '('.$attr.'='.ldap_escape_f(static::$username).')';
-    }
-    $ldap->search('(&(|'.$filter.')(objectClass=inetOrgPerson))');
-    $attrs = $ldap->fetch();
-    if ($ldap->count() < 1) {
+    $ui = ldap_get_user(static::$username);
+
+    if ($ui === FALSE) {
       msg_dialog::display(
         _('Error'),
         sprintf(
@@ -479,24 +473,25 @@ class Index {
         FATAL_ERROR_DIALOG
       );
       exit();
-    } elseif ($ldap->count() > 1) {
+    } elseif (is_string($ui)) {
       msg_dialog::display(
         _('Error'),
         sprintf(
-          _('Header user "%s" match several users in the LDAP'),
-          static::$username
+          _('Login with user "%s" triggered error: %s'),
+          static::$username,
+          $ui
         ),
         FATAL_ERROR_DIALOG
       );
       exit();
     }
-    $ui = new userinfo($config, $attrs['dn']);
+
     $ui->loadACL();
 
     $success = static::runSteps(array(
+      'checkForLockingBranch',
       'loginAndCheckExpired',
       'runSchemaCheck',
-      'checkForLockingBranch',
     ));
 
     if ($success) {
@@ -532,16 +527,10 @@ class Index {
     // force CAS authentication
     phpCAS::forceAuthentication();
     static::$username = phpCAS::getUser();
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $verify_attr = explode(',', $config->get_cfg_value('loginAttribute', 'uid'));
-    $filter = '';
-    foreach ($verify_attr as $attr) {
-      $filter .= '('.$attr.'='.ldap_escape_f(static::$username).')';
-    }
-    $ldap->search('(&(|'.$filter.')(objectClass=inetOrgPerson))');
-    $attrs = $ldap->fetch();
-    if ($ldap->count() < 1) {
+
+    $ui = ldap_get_user(static::$username);
+
+    if ($ui === FALSE) {
       msg_dialog::display(
         _('Error'),
         sprintf(
@@ -551,24 +540,25 @@ class Index {
         FATAL_ERROR_DIALOG
       );
       exit();
-    } elseif ($ldap->count() > 1) {
+    } elseif (is_string($ui)) {
       msg_dialog::display(
         _('Error'),
         sprintf(
-          _('CAS user "%s" match several users in the LDAP'),
-          static::$username
+          _('Login with user "%s" triggered error: %s'),
+          static::$username,
+          $ui
         ),
         FATAL_ERROR_DIALOG
       );
       exit();
     }
-    $ui = new userinfo($config, $attrs['dn']);
+
     $ui->loadACL();
 
     $success = static::runSteps(array(
+      'checkForLockingBranch',
       'loginAndCheckExpired',
       'runSchemaCheck',
-      'checkForLockingBranch',
     ));
 
     if ($success) {
diff --git a/html/setup.php b/html/setup.php
index c03b3bf857ed87b56ac807b21cfafd95c7231526..6c77f663c1bb307f367a83e07f6cdd6fa990bb02 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -26,13 +26,13 @@ require_once ("variables.inc");
 
 require_once("../setup/class_setup.inc");
 require_once("../setup/class_setupStep.inc");
-require_once("../setup/class_setupStep_Welcome.inc");
-require_once("../setup/class_setupStep_Language.inc");
-require_once("../setup/class_setupStep_Checks.inc");
-require_once("../setup/class_setupStep_Ldap.inc");
-require_once("../setup/class_setupStep_Config.inc");
-require_once("../setup/class_setupStep_Migrate.inc");
-require_once("../setup/class_setupStep_Finish.inc");
+require_once("../setup/class_setupStepWelcome.inc");
+require_once("../setup/class_setupStepLanguage.inc");
+require_once("../setup/class_setupStepChecks.inc");
+require_once("../setup/class_setupStepLdap.inc");
+require_once("../setup/class_setupStepConfig.inc");
+require_once("../setup/class_setupStepMigrate.inc");
+require_once("../setup/class_setupStepFinish.inc");
 
 
 /* Set header */
@@ -40,6 +40,7 @@ header("Content-type: text/html; charset=UTF-8");
 
 /* Set cookie lifetime to one day (The parameter is in seconds ) */
 session_set_cookie_params(24 * 60 * 60);
+// default cache_expire is 180
 session_cache_expire(60 * 24);
 ini_set("session.gc_maxlifetime", 24 * 60 * 60);
 
diff --git a/html/themes/breezy/dialog.css b/html/themes/breezy/dialog.css
index 3b8b0f7129823adb1ecc22eb5bfe9a6ec31f4246..b3d3478137c0733b9a33f281c1d49a60ecb139f6 100644
--- a/html/themes/breezy/dialog.css
+++ b/html/themes/breezy/dialog.css
@@ -23,6 +23,10 @@ top: 200px;
   }
 }
 
+div.msgdialog .description {
+font-style: italic;
+}
+
 /* Small screens (i.e. phones) */
 @media (max-width: 640px) {
   div.msgdialog {
diff --git a/html/themes/breezy/lists.css b/html/themes/breezy/lists.css
index 4617e55ef978c45694aaa9bfd9c8c99ceab92b99..b0ae41b550e34e7837be3a1dadcd12e0f092e157 100644
--- a/html/themes/breezy/lists.css
+++ b/html/themes/breezy/lists.css
@@ -117,70 +117,6 @@ padding: 3px;
 width: auto;
 }
 
-/* Sortable Lists (only used in user main tab) */
-div.sortableListContainer {
-border: 1px solid #C0C2C3;
-overflow: auto;
-margin-bottom: 2px;
-}
-
-.sortableListContainer th {
-background-color: #D8D8D8;
-padding: 3px;
-text-align: left;
-border-left: 1px solid #C0C2C3;
-}
-html.rtl .sortableListContainer th {
-text-align: right;
-border-right: 1px solid #C0C2C3;
-border-left: none;
-}
-
-.sortableListContainer td {
-padding: 3px;
-text-align: left;
-border-left: 1px solid #C0C2C3;
-}
-html.rtl .sortableListContainer td {
-text-align: right;
-border-right: 1px solid #C0C2C3;
-border-left: none;
-}
-
-tr.sortableListItem {
-background-color: #fcfcfc;
-cursor: move;
-color: #31363b;
-}
-
-tr.sortableListItemFill {
-background-color: #fcfcfc;
-cursor: default;
-}
-
-tr.sortableListItemOdd {
-background-color: #F5F5F5;
-cursor: move;
-color: #31363b;
-}
-
-tr.sortableListItem:hover,tr.sortableListItemOdd:hover {
-background-color: #EEE;
-}
-
-tr.sortableListItemDisabled {
-cursor: default;
-color: #CCC;
-}
-
-table.sortableListTable {
-border: 0;
-}
-
-tr.sortableListItemMarked {
-background-color: #FFD;
-}
-
 /* Tree List (used in baseSelector) */
 ul.treeList,ul.treeList ul {
 list-style-type: none;
diff --git a/html/themes/breezy/style.css b/html/themes/breezy/style.css
index e8f4846d596d2fc831a6ea70db4ed8da85523294..a3edd35a1210ec82456124323baa0e25bf5203f4 100644
--- a/html/themes/breezy/style.css
+++ b/html/themes/breezy/style.css
@@ -60,68 +60,6 @@ html.rtl div.scrollbody {
 text-align: right;
 }
 
-/* -------------- DEPRECATED ----------------- */
-td.list1 {
-background: transparent;
-border-right: 1px solid silver;
-padding: 3px;
-height: 22px;
-}
-
-td.list1nohighlight {
-background: #fcfcfc;
-border-right: 1px solid silver;
-padding: 3px;
-height: 22px;
-}
-
-td.list1nohighlightdisabled {
-background-color: #DFDBD7;
-border-right: 1px solid silver;
-padding: 3px;
-height: 2px;
-}
-
-td.list1#fill {
-height: 100%;
-}
-
-td.list1#icon {
-width: 0;
-text-align: center;
-}
-
-td.list1#info {
-width: 200px;
-}
-
-td.list1#property {
-width: 50px;
-}
-
-td.list1#properties7 {
-width: 136px;
-}
-
-td.list1#properties8 {
-width: 152px;
-}
-
-td.list1#properties9 {
-width: 168px;
-}
-
-td.list1#properties10 {
-width: 186px;
-}
-
-td.list1#actions {
-width: 52px;
-border-right: 0;
-text-align: right;
-}
-/* -------------------------------------------- */
-
 /* Title bar */
 a.maintitlebar,div.maintitlebar {
 font-family: arial,helvetica,sans-serif;
diff --git a/html/themes/legacy/lists.css b/html/themes/legacy/lists.css
index 680397b2d94d912979198a97d48a683e7a23744e..d6465067dbe75afef50a66f4e08eb6e262e55237 100644
--- a/html/themes/legacy/lists.css
+++ b/html/themes/legacy/lists.css
@@ -108,70 +108,6 @@ padding: 3px;
 width: auto;
 }
 
-/* Sortable Lists (only used in user main tab) */
-div.sortableListContainer {
-border:1px solid #AAA;
-overflow:auto;
-margin-bottom:2px;
-}
-
-.sortableListContainer th {
-background-color:#D8D8D8;
-padding:3px;
-text-align:left;
-border-left:1px solid #AAA;
-}
-html.rtl .sortableListContainer th {
-text-align:right;
-border-right:1px solid #AAA;
-border-left:none;
-}
-
-.sortableListContainer td {
-padding:3px;
-text-align:left;
-border-left:1px solid #AAA;
-}
-html.rtl .sortableListContainer td {
-text-align:right;
-border-right:1px solid #AAA;
-border-left:none;
-}
-
-tr.sortableListItem {
-background-color:#FFF;
-cursor:move;
-color:#000;
-}
-
-tr.sortableListItemFill {
-background-color:#FFF;
-cursor:default;
-}
-
-tr.sortableListItemOdd {
-background-color:#F5F5F5;
-cursor:move;
-color:#000;
-}
-
-tr.sortableListItem:hover,tr.sortableListItemOdd:hover {
-background-color:#EEE;
-}
-
-tr.sortableListItemDisabled {
-cursor:default;
-color:#CCC;
-}
-
-table.sortableListTable {
-border:0;
-}
-
-tr.sortableListItemMarked {
-background-color:#FFD;
-}
-
 /* Tree List (used in baseSelector) */
 ul.treeList,ul.treeList ul {
 list-style-type: none;
diff --git a/html/themes/legacy/style.css b/html/themes/legacy/style.css
index a3a2936958e43b8eae773d9c696b8c516ed87b6e..3b06d336243196b4d739e8e97f0aef346828ce80 100644
--- a/html/themes/legacy/style.css
+++ b/html/themes/legacy/style.css
@@ -60,71 +60,6 @@ html.rtl div.scrollbody {
 text-align: right;
 }
 
-/* -------------- DEPRECATED ----------------- */
-td.list1 {
-background:transparent;
-border-right:1px solid silver;
-padding:3px;
-height:22px;
-}
-
-td.list1nohighlight {
-background:#FFF;
-border-right:1px solid silver;
-padding:3px;
-height:22px;
-}
-
-td.list1nohighlightdisabled {
-background-color:#DFDBD7;
-border-right:1px solid silver;
-padding:3px;
-height:22px;
-}
-
-td.list1#fill {
-height:100%;
-}
-
-td.list1#icon {
-width:0;
-text-align:center;
-}
-
-td.list1#entry {
-}
-
-td.list1#info {
-width:200px;
-}
-
-td.list1#property {
-width:50px;
-}
-
-td.list1#properties7 {
-width:136px;
-}
-
-td.list1#properties8 {
-width:152px;
-}
-
-td.list1#properties9 {
-width:168px;
-}
-
-td.list1#properties10 {
-width:186px;
-}
-
-td.list1#actions {
-width:52px;
-border-right:0;
-text-align:right;
-}
-/* -------------------------------------------- */
-
 /* Title bar */
 a.maintitlebar,div.maintitlebar {
 font-family: arial,helvetica,sans-serif;
diff --git a/ihtml/themes/breezy/framework.tpl b/ihtml/themes/breezy/framework.tpl
index 3c6bc51335a2c76cd9a73c039acf91ef043bc093..d1061fe2821622203d72f5cd9a4e8a4f95ec1a95 100644
--- a/ihtml/themes/breezy/framework.tpl
+++ b/ihtml/themes/breezy/framework.tpl
@@ -19,7 +19,7 @@
       </div>
       <div id="header-right">
         <a><span class="optional">{t}Signed in:{/t} </span><b>{$username}</b></a>
-        {if ($sessionLifetime >= 1)}
+        {if ($sessionLifetime > 0)}
         <div class="logout-label">
           <canvas id="sTimeout" width="22" height="22" title="{$sessionLifetime}|{t}Session expires in %d!{/t}"></canvas>
         </div>
@@ -67,7 +67,7 @@
    }
   {/literal}
 
-  {if ($sessionLifetime >= 1)}
+  {if ($sessionLifetime > 0)}
    logout.delay({$sessionLifetime});
   {/if}
 
diff --git a/ihtml/themes/breezy/msg_dialog.tpl b/ihtml/themes/breezy/msg_dialog.tpl
index 5a03eec79dbb9c1467bb2493cdbdf14a66e1a6da..a10127140680a8124569ef8e4e63e28309590cdf 100644
--- a/ihtml/themes/breezy/msg_dialog.tpl
+++ b/ihtml/themes/breezy/msg_dialog.tpl
@@ -12,7 +12,7 @@
       background-image:url(images/opacity_black.png);">
 {else}
 
-  {if $s_Trace != "" && $i_TraceCnt >= 1}
+  {if $s_Trace != "" && $i_TraceCnt != 0}
   <div id="trace_{$i_ID}"
     style="
       display:none;
@@ -49,7 +49,7 @@
       {$s_Message}
     </div>
     <div class="plugbottom">
-      {if $s_Trace != "" && $i_TraceCnt >= 1}
+      {if $s_Trace != "" && $i_TraceCnt != 0}
         <input type="button" id="Trace" name="Trace"
           onClick="$('trace_{$i_ID}').toggle();" value="{t}Trace{/t}"/>
       {/if}
diff --git a/ihtml/themes/breezy/simple-list.tpl b/ihtml/themes/breezy/simple-list.tpl
index 993dfe3dd293249fc0d688b49269cbc0ea77f8ed..41b9deec4480862575bd4132b69e849a3c98c8ec 100644
--- a/ihtml/themes/breezy/simple-list.tpl
+++ b/ihtml/themes/breezy/simple-list.tpl
@@ -10,9 +10,10 @@
           <table>
             <tbody>
               <tr>
-                <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td class="optional">{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td>
-                {if $BASE}<td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td>{/if}
-                <td>{$ACTIONS}</td>
+                {if $BASE}<td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td>{/if}
+                <td class="optional">{$RELOAD}&nbsp;</td>
+                {if $BASE}<td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td>{/if}
+                {if $ACTIONS}<td>{$SEPARATOR}&nbsp;</td><td>{$ACTIONS}</td>{/if}
               </tr>
             </tbody>
           </table>
diff --git a/include/accept-to-gettext.inc b/include/accept-to-gettext.inc
index a19f126391e25bccd19838dcfab4bb32507dce78..ff70a21339e2ab096da9d86acc7d97479bc384fc 100644
--- a/include/accept-to-gettext.inc
+++ b/include/accept-to-gettext.inc
@@ -145,11 +145,11 @@ function al2gt($gettextlangs, $mime)
   /* Loop through the available languages/encodings, and pick the one
    * with the highest score, excluding the ones with a charset the user
    * did not include. */
-  /* The lang with the maximum score found */
+  // The lang with the maximum score found
   $max_lang     = NULL;
-  /* The lang score of this lang */
+  // The lang score of this lang
   $max_l_score  = 0;
-  /* The char score of this lang */
+  // The char score of this lang
   $max_c_score  = 0;
   foreach ($gettextlangs as $gtlang) {
     if (!($infos = parse_gettext_lang($gtlang))) {
@@ -160,13 +160,13 @@ function al2gt($gettextlangs, $mime)
     $lang_score = max_scores($lang_scores, array($lang,$lang.'-'.$country,'*'));
     $char_score = max_scores($char_scores, array($char,'*'));
     if ($char_score == 0) {
-    /* exclude charsets the user refuses */
+      // exclude charsets the user refuses
       continue;
     }
 
+    // if lang scores are equals we compare char scores
     if   (($lang_score > $max_l_score)
       || (($lang_score == $max_l_score) && ($char_score > $max_c_score))) {
-    /* if lang scores are equals we compare char scores */
       $max_l_score  = $lang_score;
       $max_c_score  = $char_score;
       $max_lang     = $gtlang;
diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 47c435c7524ecda374a7f00a2792d24f2b8153d1..ee3deec13dcf70f3b035ce755af5af215485c561 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -1,9 +1,8 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2017  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,9 +32,13 @@ class CopyPasteHandler
   var $current;
 
   /*!
-   * \brief This array contains all dns of the currently copyied objects
+   * \brief This array contains all dns of the currently copied objects
+   */
+  protected $objectList = array();
+  /*!
+   * \brief This array contains all remaining objects to paste
    */
-  var $queue = array();
+  protected $queue = array();
 
   /*!
    *  \brief The dn of the last edited object
@@ -62,33 +65,22 @@ class CopyPasteHandler
   /*!
    * \brief Entry entry to Copy & Paste queue.
    * A Queue entry is represented as follows.
-   *  array['file_name']  - Position on hdd
    *  array['method']     - 'copy' or 'cut'
    *  array['dn']         - the dn of the object added to the queue
-   *  array['tab_class']  - Tab object that should be used to initialize the new object
-   *  array['tab_object'] - Tab object name used to initialize correct object Type like USERTABS
+   *  array['type']       - Object type
    *
    * \param String $dn The dn of the object added to the queue
    *
    * \param String $action Copy or Cut
    *
-   * \param String $tab_class Tab object that should be used to initialize the new object
-   *
-   * \param String $tab_object Tab object name used to initialize correct object Type like USERTABS
-   *
-   * \param String $tab_acl_category Tab with acl category
-   *
-   * \param Object $parent the parent to set to the tab object
+   * \param String $type the type of the object
    */
-  function add_to_queue()
+  function add_to_queue($dn, $action, $type)
   {
-    global $config;
-    $dn     = func_get_arg(0);
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, "add_to_queue");
-    $action = func_get_arg(1);
+    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'add_to_queue');
 
-    if (!in_array($action, array("cut","copy"))) {
-      trigger_error(sprintf("Specified action '%s' does not exists for copy & paste.", $action));
+    if (!in_array($action, array('cut','copy'))) {
+      trigger_error(sprintf('Specified action "%s" does not exists for copy & paste.', $action));
       return FALSE;
     }
 
@@ -96,41 +88,17 @@ class CopyPasteHandler
 
     $tmp['method']  = $action;
     $tmp['dn']      = $dn;
+    $tmp['type']    = $type;
 
-    if (func_num_args() == 3) {
-      $type               = func_get_arg(2);
-      $tmp['type']        = $type;
-      $infos              = objects::infos($type);
-      $tmp['aclCategory'] = $infos['aclCategory'];
-      $tmp['mainTab']     = $infos['mainTab'];
-      $tmp['parent']      = NULL;
-    } else {
-      // Deprecated
-      $tab_class = func_get_arg(2);
-      $tab_object = func_get_arg(3);
-      $tab_acl_category = func_get_arg(4);
-      $parent = NULL;
-      if (func_num_args() > 5) {
-        $parent = func_get_arg(5);
-      }
-
-      if (!class_available($tab_class)) {
-        trigger_error(sprintf("Specified class object '%s' does not exists.", $tab_class));
-        return FALSE;
-      }
+    $infos              = objects::infos($type);
+    $tmp['aclCategory'] = $infos['aclCategory'];
+    $tmp['mainTab']     = $infos['mainTab'];
+    $tmp['parent']      = NULL;
 
-      if (!isset($config->data['TABS'][$tab_object])) {
-        trigger_error(sprintf("Specified tab object '%s' does not exists.", $tab_object));
-        return FALSE;
-      }
-      $tmp['tab_class']   = $tab_class;
-      $tmp['tab_object']  = $tab_object;
-      $tmp['aclCategory'] = $tab_acl_category;
-      $tmp['mainTab']     = reset($config->data['TABS'][$tab_object]);
-      $tmp['parent']      = $parent;
+    $this->queue[] = $tmp;
+    if ($action == 'copy') {
+      $this->objectList[] = $tmp;
     }
-
-    $this->queue[]        = $tmp;
     $this->require_update = TRUE;
 
     return TRUE;
@@ -147,6 +115,17 @@ class CopyPasteHandler
     $this->current        = FALSE;
     $this->require_update = TRUE;
     $this->queue          = array();
+    $this->objectList     = array();
+  }
+
+  /*!
+   * \brief This resets the queue to allow pasting again.
+   */
+  function resetPaste()
+  {
+    $this->current        = FALSE;
+    $this->require_update = TRUE;
+    $this->queue          = $this->objectList;
   }
 
   /*!
@@ -157,30 +136,17 @@ class CopyPasteHandler
     return ((count($this->queue) > 0) || ($this->current != FALSE));
   }
 
-
   /*!
-   * \brief Paste one entry from queue
+   * \brief Paste one entry from LDAP
    */
-  function load_entry_from_queue($entry, $base)
+  protected function load_entry_from_ldap($entry, $base)
   {
-    global $config;
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $entry['dn'], 'load_entry_from_ldap');
     if (!isset($entry['tab_class']) && !isset($entry['type'])) {
       return array();
     }
 
-    if (isset($entry['type'])) {
-      $entry['object'] = objects::open($entry['dn'], $entry['type']);
-    } else {
-      trigger_error('Call to deprecated tabs constructor');
-      // old way
-      $tab_c  = $entry['tab_class'];
-      $tab_o  = $entry['tab_object'];
-      $tab_a  = $entry['aclCategory'];
-
-      // Deprecated
-      $entry['object'] = new $tab_c(NULL, $config->data['TABS'][$tab_o], $entry['dn'], $tab_a);
-    }
+    $entry['object'] = objects::open($entry['dn'], $entry['type']);
 
     $entry['object']->set_acl_base($base);
     if ($entry['parent'] !== NULL) {
@@ -217,24 +183,21 @@ class CopyPasteHandler
 
         /* Update entries on demand */
         if (!isset($entry['object'])) {
-          $entry = $this->load_entry_from_queue($entry, $base);
+          $entry = $this->load_entry_from_ldap($entry, $base);
           $this->queue[$key] = $entry;
         }
-        $msgs = $entry['object']->check();
 
         /* Retrieve ACL infos */
-        $copy_acl = $ui->is_copyable($entry['dn'], $entry['aclCategory'], $entry['mainTab']);
+        $copy_acl = $ui->is_copyable($entry['dn'], $entry['aclCategory']);
         $cut_acl  = $ui->is_cutable($entry['dn'], $entry['aclCategory'], $entry['mainTab']);
 
         /* Check permissions */
-        if ($entry['method'] == "copy" && !$copy_acl) {
+        if (($entry['method'] == 'copy') && !$copy_acl) {
           $this->disallowed_objects[$key] = $entry;
-        } elseif ($entry['method'] == "cut" && !$cut_acl) {
+        } elseif (($entry['method'] == 'cut') && !$cut_acl) {
           $this->disallowed_objects[$key] = $entry;
-        } elseif (!count($msgs)) {
-          $this->clean_objects[$key]  = $entry;
         } else {
-          $this->objects_to_fix[$key] = $entry;
+          $this->clean_objects[$key] = $entry;
         }
       }
       if (count($this->disallowed_objects)) {
@@ -251,28 +214,32 @@ class CopyPasteHandler
     if (count($this->clean_objects)) {
       $this->save_object();
       foreach ($this->clean_objects as $key => $entry) {
-        /* Remove from queue -> avoid saving twice */
-        unset($this->queue[$key]);
-        unset($this->clean_objects[$key]);
+        $this->current = $entry;
+        $errors = $this->current['object']->save();
 
-        $this->save_current($entry);
+        if (empty($errors)) {
+          $this->current_saved();
+          /* Remove from queue -> avoid saving twice */
+          unset($this->queue[$key]);
+        } else {
+          $this->objects_to_fix[$key] = $entry;
+        }
+        unset($this->clean_objects[$key]);
       }
+      $this->current = FALSE;
     }
 
     /* Save edited entry and force loading new one */
     if (isset($this->current['object'])) {
       $this->current['object']->save_object();
-    }
+      /* Save current object if edition is finished */
+      if (isset($_POST['edit_finish'])) {
+        $errors = $this->current['object']->save();
 
-    /* Save current object if edition is finished */
-    if (isset($_POST['edit_finish']) && $this->current) {
-      $msgs = $this->current['object']->check();
-
-      if (!count($msgs)) {
-        $this->save_current();
-      } else {
-        foreach ($msgs as $msg) {
-          msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
+        if (empty($errors)) {
+          $this->current_saved();
+        } else {
+          msg_dialog::displayChecks($errors);
         }
       }
     }
@@ -304,21 +271,16 @@ class CopyPasteHandler
         }
       }
     }
-    return "";
+    return '';
   }
 
-  private function save_current($object = NULL)
+  private function current_saved()
   {
-    if ($object !== NULL) {
-      $this->current = $object;
-    }
-    $this->lastdn = $this->current['object']->dn;
-    $this->current['object']->save();
+    $this->lastdn   = $this->current['object']->dn;
     $this->handleReferences();
-    $this->current = FALSE;
+    $this->current  = FALSE;
   }
 
-
   /*!
    * \brief Get the last endited entry
    *
@@ -350,7 +312,11 @@ class CopyPasteHandler
     $dst_dn = $this->current['object']->dn;
     $src_dn = $this->current['dn'];
 
-    $this->current['object']->getBaseObject()->handleForeignKeys($src_dn, $dst_dn, ($this->current['method'] == 'cut'?'move':'copy'));
+    $this->current['object']->getBaseObject()->handleForeignKeys(
+      $src_dn,
+      $dst_dn,
+      ($this->current['method'] == 'cut' ? 'move' : 'copy')
+    );
   }
 
   /*!
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 54e2fb12133857b74d391e681829ff10421e8b1c..ea416e0b454e7ca579d45016e3955af79637348f 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -22,10 +22,26 @@ class ThemeFileParsingException extends Exception {}
 
 class IconThemeDir
 {
+  /* Nominal (unscaled) size of the icons in this directory.
+   * Required. */
   private $Size;
+
+  /* Specifies the minimum (unscaled) size that the icons in this directory can be scaled to.
+   * Defaults to the value of Size if not present. */
   private $MinSize;
+
+  /* Specifies the maximum (unscaled) size that the icons in this directory can be scaled to.
+   * Defaults to the value of Size if not present. */
   private $MaxSize;
+
+  /* The type of icon sizes for the icons in this directory.
+   * Valid types are Fixed, Scalable and Threshold.
+   * The type decides what other keys in the section are used.
+   * If not specified, the default is Threshold. */
   private $Type      = 'Threshold';
+
+  /* The icons in this directory can be used if the size differ at most this much from the desired (unscaled) size.
+   * Defaults to 2 if not present. */
   private $Threshold = 2;
 
   function __construct($infos)
@@ -50,6 +66,7 @@ class IconThemeDir
     switch ($this->Type) {
       case 'Fixed':
         return ($this->Size == $size);
+      default:
       case 'Threshold':
       case 'Scalable':
         return (($this->MinSize <= $size) && ($size <= $this->MaxSize));
@@ -61,6 +78,7 @@ class IconThemeDir
     switch ($this->Type) {
       case 'Fixed':
         return abs($this->Size - $size);
+      default:
       case 'Threshold':
       case 'Scalable':
         if ($size < $this->MinSize) {
@@ -170,7 +188,7 @@ class IconTheme
     return NULL;
   }
 
-  static public $default_theme  = 'default';
+  static public $default_theme  = 'breezy';
   static public $extensions     = array('png', 'xpm', 'svg');
   static public $find_closest   = FALSE;
 
@@ -184,7 +202,7 @@ class IconTheme
         if (file_exists("$path/$file/index.theme") && !preg_match("/^\./", $file)) {
           try {
             if ($file == static::$default_theme) {
-              $themes[$file] = new IconTheme("$path/$file",  NULL);
+              $themes[$file] = new IconTheme("$path/$file", NULL);
             } else {
               $themes[$file] = new IconTheme("$path/$file", static::$default_theme);
             }
diff --git a/include/class_SnapshotDialogs.inc b/include/class_SnapshotDialogs.inc
index 7404ebc3f8d5b9a686cc022af8f58f162258f2cd..ea499d6cad05832ced805a89db0e0881913598e9 100644
--- a/include/class_SnapshotDialogs.inc
+++ b/include/class_SnapshotDialogs.inc
@@ -207,9 +207,9 @@ class SnapshotRestoreDialog extends simplePlugin
   function updateList ()
   {
     if ($this->global) {
-      $this->snapshots = $this->parent->getAllDeletedSnapshots(TRUE);
+      $this->snapshots = $this->parent->getAllDeletedSnapshots();
     } else {
-      $this->snapshots = $this->parent->getAvailableSnapsShots($this->object_dn, TRUE);
+      $this->snapshots = $this->parent->getAvailableSnapsShots($this->object_dn);
     }
   }
 
@@ -219,7 +219,7 @@ class SnapshotRestoreDialog extends simplePlugin
       $objects = array(
         array(
           'name'  => 'snapshot',
-          'dn'    => LDAP::fix($this->snapDn),
+          'dn'    => $this->snapDn,
           'icon'  => 'geticon.php?context=actions&amp;icon=document-restore&amp;size=16',
           'type'  => 'Snapshot'
         )
@@ -233,7 +233,7 @@ class SnapshotRestoreDialog extends simplePlugin
       $objects = array(
         array(
           'name'  => 'snapshot',
-          'dn'    => LDAP::fix($this->snapDn),
+          'dn'    => $this->snapDn,
           'icon'  => 'geticon.php?context=actions&amp;icon=document-restore&amp;size=16',
           'type'  => 'Snapshot'
         )
diff --git a/include/class_SnapshotHandler.inc b/include/class_SnapshotHandler.inc
index 954d95fee2dd3ba257ed2d92b812da57b876eadb..60e55bf0c13131ec28c59a82ba90c7c3e430b6ba 100644
--- a/include/class_SnapshotHandler.inc
+++ b/include/class_SnapshotHandler.inc
@@ -95,59 +95,16 @@ class SnapshotHandler
   }
 
   /*!
-   * \brief Get the deleted snapshots
-   *
-   * \param string $objectBase
-   *
-   * \param boolean $raw FALSE
+   * \brief Check if there are deleted snapshots
    */
-  function getDeletedSnapshots($objectBase, $raw = FALSE)
+  function hasDeletedSnapshots()
   {
-    global $config;
-    if (!$this->enabled()) {
-      return array();
-    }
-
-    $ldap = $config->get_ldap_link();
-
-    // Initialize base
-    $base = $this->snapshot_dn($objectBase);
-
-    /* Fetch all objects and check if they do not exist anymore */
-    $objects = array();
-    $ldap->cd($base);
-    $ldap->ls("(objectClass=gosaSnapshotObject)", $base,
-                      array("gosaSnapshotTimestamp", "gosaSnapshotDN", "description"));
-    while ($entry = $ldap->fetch()) {
-      $chk = str_replace($base, "", $entry['dn']);
-      if (preg_match("/,ou=/", $chk)) {
-        continue;
+    foreach ($this->getSnapshotBases() as $base) {
+      if (count($this->getAllDeletedSnapshots($base)) > 0) {
+        return TRUE;
       }
-
-      if (!isset($entry['description'][0])) {
-        $entry['description'][0]  = "";
-      }
-      $objects[] = $entry;
     }
-
-    /* Check if entry still exists */
-    foreach ($objects as $key => $entry) {
-      $ldap->cat($entry['gosaSnapshotDN'][0]);
-      if ($ldap->count()) {
-        unset($objects[$key]);
-      }
-    }
-
-    /* Format result as requested */
-    if ($raw) {
-      return $objects;
-    } else {
-      $tmp = array();
-      foreach ($objects as $key => $entry) {
-        $tmp[base64_encode($entry['dn'])] = $entry['description'][0];
-      }
-    }
-    return $tmp;
+    return FALSE;
   }
 
   /*!
@@ -209,8 +166,11 @@ class SnapshotHandler
 
     /* Fetch all objects with  gosaSnapshotDN=$dn */
     $ldap->cd($base);
-    $ldap->ls("(&(objectClass=gosaSnapshotObject)(gosaSnapshotDN=".$dn."))", $base,
-        array("gosaSnapshotTimestamp","gosaSnapshotDN","description"));
+    $ldap->search(
+      '(&(objectClass=gosaSnapshotObject)(gosaSnapshotDN='.ldap_escape_f($dn).'))',
+      array('gosaSnapshotTimestamp','gosaSnapshotDN','description'),
+      'one'
+    );
 
     /* Put results into a list and add description if missing */
     $objects = array();
@@ -273,34 +233,31 @@ class SnapshotHandler
     /* Create object */
     $data = '';
     foreach ($dns as $tmp_dn) {
-      $data .= $ldap->generateLdif(LDAP::fix($tmp_dn), '(!(objectClass=gosaDepartment))', 'sub');
+      $data .= $ldap->generateLdif($tmp_dn, '(!(objectClass=gosaDepartment))', 'sub');
       if (!$ldap->success()) {
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $tmp_dn, "", get_class()), LDAP_ERROR);
+        msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $tmp_dn, '', get_class()), LDAP_ERROR);
       }
     }
 
-    $newName  = str_replace(".", "", $sec."-".$usec);
     $target   = array();
 
-    $target['objectClass']            = array("top", "gosaSnapshotObject");
+    $target['objectClass']            = array('top', 'gosaSnapshotObject');
     $target['gosaSnapshotData']       = gzcompress($data, 6);
     $target['gosaSnapshotDN']         = $dn;
     $target['description']            = $description;
-    $target['gosaSnapshotTimestamp']  = $newName;
 
     /* Insert the new snapshot
        But we have to check first, if the given gosaSnapshotTimestamp
        is already used, in this case we should increment this value till there is
        an unused value. */
-    $new_dn = "gosaSnapshotTimestamp=".$newName.",".$new_base;
-    $ldap->cat($new_dn);
-    while ($ldap->count()) {
+    do {
+      $target['gosaSnapshotTimestamp']  = str_replace('.', '', $sec.'-'.$usec);
+      $new_dn                           = 'gosaSnapshotTimestamp='.$target['gosaSnapshotTimestamp'].','.$new_base;
       $ldap->cat($new_dn);
-      $newName = str_replace(".", "", $sec."-".(++$usec));
-      $new_dn                           = "gosaSnapshotTimestamp=".$newName.",".$new_base;
-      $target['gosaSnapshotTimestamp']  = $newName;
-    }
-    /* Inset this new snapshot */
+      $usec++;
+    } while ($ldap->count());
+
+    /* Insert this new snapshot */
     $ldap->cd($this->snapshotRDN);
     $ldap->create_missing_trees($this->snapshotRDN);
     $ldap->create_missing_trees($new_base);
@@ -308,7 +265,7 @@ class SnapshotHandler
     $ldap->add($target);
 
     if (!$ldap->success()) {
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $new_base, "", get_class()), LDAP_ERROR);
+      msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $new_base, '', get_class()), LDAP_ERROR);
     }
   }
 
@@ -333,7 +290,7 @@ class SnapshotHandler
    *
    * \return available snapshots for the given base
    */
-  function getAvailableSnapsShots($dn, $raw = FALSE)
+  function getAvailableSnapsShots($dn)
   {
     global $config;
     if (!$this->enabled()) {
@@ -349,8 +306,11 @@ class SnapshotHandler
 
     /* Fetch all objects with  gosaSnapshotDN=$dn */
     $ldap->cd($new_base);
-    $ldap->ls("(&(objectClass=gosaSnapshotObject)(gosaSnapshotDN=".$dn."))", $new_base,
-        array("gosaSnapshotTimestamp","gosaSnapshotDN","description"));
+    $ldap->search(
+      '(&(objectClass=gosaSnapshotObject)(gosaSnapshotDN='.ldap_escape_f($dn).'))',
+      array('gosaSnapshotTimestamp','gosaSnapshotDN','description'),
+      'one'
+    );
 
     /* Put results into a list and add description if missing */
     while ($entry = $ldap->fetch()) {
@@ -360,16 +320,7 @@ class SnapshotHandler
       $tmp[] = $entry;
     }
 
-    /* Return the raw array, or format the result */
-    if ($raw) {
-      return $tmp;
-    } else {
-      $tmp2 = array();
-      foreach ($tmp as $entry) {
-        $tmp2[base64_encode($entry['dn'])] = $entry['description'][0];
-      }
-    }
-    return $tmp2;
+    return $tmp;
   }
 
   /*!
@@ -379,7 +330,7 @@ class SnapshotHandler
    *
    * \param boolean $raw FALSE
    */
-  function getAllDeletedSnapshots($base_of_object, $raw = FALSE)
+  function getAllDeletedSnapshots($base_of_object)
   {
     global $config;
     if (!$this->enabled()) {
@@ -393,9 +344,12 @@ class SnapshotHandler
     /* Fetch all objects and check if they do not exist anymore */
     $tmp  = array();
     $ldap->cd($new_base);
-    $ldap->ls("(objectClass=gosaSnapshotObject)", $new_base, array("gosaSnapshotTimestamp","gosaSnapshotDN","description"));
+    $ldap->search(
+      '(objectClass=gosaSnapshotObject)',
+      array('gosaSnapshotTimestamp','gosaSnapshotDN','description'),
+      'one'
+    );
     while ($entry = $ldap->fetch()) {
-
       $chk = str_replace($new_base, "", $entry['dn']);
       if (preg_match("/,ou=/", $chk)) {
         continue;
@@ -415,16 +369,7 @@ class SnapshotHandler
       }
     }
 
-    /* Format result as requested */
-    if ($raw) {
-      return $tmp;
-    } else {
-      $tmp2 = array();
-      foreach ($tmp as $key => $entry) {
-        $tmp2[base64_encode($entry['dn'])] = $entry['description'][0];
-      }
-    }
-    return $tmp2;
+    return $tmp;
   }
 
 
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index 4727f62bba8f58a8a108a6052c3270a63de096f9..7fac5d87708f1f800d92b6ee87de9d241df3c154 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-2016  FusionDirectory
+  Copyright (C) 2011-2017  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,8 +27,8 @@
 /*!
  * \brief Class Base Selector
  */
-class baseSelector {
-
+class baseSelector
+{
   private $base;
   protected $pid;
   private $action;
@@ -126,7 +126,7 @@ class baseSelector {
       $elements = explode(',', substr($base, 0, strlen($base) - strlen($config->current['BASE'])));
       $elements = array_reverse($elements, TRUE);
 
-      $this->pathMapping[$base] = (($base == $config->current['BASE']) ? '/' : ldap::fix(preg_replace('/(^|,)[a-z0-9]+=/i', '/', implode(',', $elements))));
+      $this->pathMapping[$base] = (($base == $config->current['BASE']) ? '/' : preg_replace('/(^|,)[a-z0-9]+=/i', '/', implode(',', $elements)));
     }
 
     // Save bases to session for autocompletion
@@ -140,8 +140,6 @@ class baseSelector {
    */
   function update($force = FALSE)
   {
-    global $config;
-
     if (!isset($this->base) || ($this->base == '')) {
       $this->lastState = FALSE;
       return FALSE;
@@ -151,7 +149,7 @@ class baseSelector {
     $this->action = NULL;
     $last_base    = $this->base;
     if (isset($_REQUEST['BPID']) && $_REQUEST['BPID'] == $this->pid) {
-      if (isset($_POST['bs_rebase_'.$this->pid]) && !empty($_POST['bs_rebase_'.$this->pid])) {
+      if (!empty($_POST['bs_rebase_'.$this->pid])) {
         $new_base = base64_decode($_POST['bs_rebase_'.$this->pid]);
         if (isset($this->pathMapping[$new_base])) {
           $this->base   = $new_base;
@@ -160,21 +158,17 @@ class baseSelector {
           $this->lastState = FALSE;
           return FALSE;
         }
-      } else {
-        // Input field set?
-        if (isset($_POST[$this->getInputHtmlId()])) {
-
-          // Take over input field base
-          if ($this->submitButton && isset($_POST['submit_base_'.$this->pid.'_x']) || !$this->submitButton) {
-
-            // Check if base is available
-            $this->lastState = FALSE;
-            foreach ($this->pathMapping as $key => $path) {
-              if (mb_strtolower($path) == mb_strtolower($_POST[$this->getInputHtmlId()])) {
-                $this->base       = $key;
-                $this->lastState  = TRUE;
-                break;
-              }
+      } elseif (isset($_POST[$this->getInputHtmlId()])) {
+        // Take over input field base
+        if (($this->submitButton && isset($_POST['submit_base_'.$this->pid.'_x'])) || !$this->submitButton) {
+
+          // Check if base is available
+          $this->lastState = FALSE;
+          foreach ($this->pathMapping as $key => $path) {
+            if (mb_strtolower($path) == mb_strtolower($_POST[$this->getInputHtmlId()])) {
+              $this->base       = $key;
+              $this->lastState  = TRUE;
+              break;
             }
           }
         }
@@ -187,6 +181,15 @@ class baseSelector {
       return TRUE;
     }
 
+    $this->renderTree();
+
+    $this->lastState = TRUE;
+    return TRUE;
+  }
+
+  protected function renderTree()
+  {
+    global $config;
     $link = "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($config->current['BASE'])."';  $('submit_tree_base_".$this->pid."').click();\"";
     $this->tree = '<input class="base-selector" type="text" name="'.$this->getInputHtmlId().'"'.
                   ' id="'.$this->getInputHtmlId().'"'.
@@ -205,13 +208,12 @@ class baseSelector {
     }
     $this->tree .= "</script>";
 
-    $selected     = $this->base == $config->current['BASE']?"Selected":"";
+    $selected     = ($this->base == $config->current['BASE'] ? 'Selected' : '');
     $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;
 
     foreach ($this->pathMapping as $base => $dummy) {
-
       // Skip root for tree
       if ($base == $config->current['BASE']) {
         continue;
@@ -223,25 +225,23 @@ class baseSelector {
       $indent = count($elements);
       if (!$first && ($indent == $last_indent)) {
         $this->tree .= "</li>\n";
-      }
-      if ($indent > $last_indent) {
+      } elseif ($indent > $last_indent) {
         $this->tree .= "<ul>\n";
-      }
-      if ($indent < $last_indent) {
+      } elseif ($indent < $last_indent) {
         for ($i = 0; $i < ($last_indent - $indent); $i++) {
           $this->tree .= "</li></ul>\n";
         }
         $this->tree .= "</li>\n";
       }
-      $selected   = ($this->base == $base?" class='treeListSelected'":"");
+      $selected   = ($this->base == $base ? ' class="treeListSelected"' : '');
       $link       = "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($base)."';$('submit_tree_base_".$this->pid."').click();\"";
       $this->tree .= "<li><a$selected $link>".
                     '<img class="center" '.
                     'src="'.htmlentities($config->department_info[$base]['img'], ENT_COMPAT, 'UTF-8').'" '.
                     'alt="'.$config->department_info[$base]['name'].'"/>&nbsp;'.
                     $this->gennonbreaks($config->department_info[$base]['name']).
-                    ($config->department_info[$base]['description'] == ''?'':'&nbsp;<span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>').
-                    "</a>";
+                    ($config->department_info[$base]['description'] == '' ? '' : '&nbsp;<span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>').
+                    '</a>';
 
       $last_indent  = $indent;
       $first        = FALSE;
@@ -260,12 +260,9 @@ class baseSelector {
     if ($this->submitButton) {
       $this->tree .= "&nbsp;<input class='center' type='image' src='geticon.php?context=actions&amp;icon=submit&amp;size=16' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>";
     }
-    $this->tree .= "<input type='submit' style='display:none' name='submit_tree_base_".$this->pid."' id='submit_tree_base_".$this->pid."'>";
-    $this->tree .= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>";
-    $this->tree .= "<input type='hidden' name='BPID' id='BPID' value='".$this->pid."'>";
-
-    $this->lastState = TRUE;
-    return TRUE;
+    $this->tree .= '<input type="submit" style="display:none" name="submit_tree_base_'.$this->pid.'" id="submit_tree_base_'.$this->pid.'"/>';
+    $this->tree .= '<input type="hidden" name="bs_rebase_'.$this->pid.'" id="bs_rebase_'.$this->pid.'"/>';
+    $this->tree .= '<input type="hidden" name="BPID" id="BPID" value="'.$this->pid.'"/>';
   }
 
 
diff --git a/include/class_config.inc b/include/class_config.inc
index b53decb86ec68d1fc61b926014580f601e63619c..d63109e729f238cddf34e701199bdd3a13abf577 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -1,9 +1,8 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2017  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
@@ -29,17 +28,16 @@
  * \brief This class is responsible for parsing and querying the
  * fusiondirectory configuration file.
  */
-
-class config  {
-
+class config
+{
   /* XML parser */
   var $parser;
   var $config_found     = FALSE;
   var $tags             = array();
   var $level            = 0;
   var $gpc              = 0;
-  var $section          = "";
-  var $currentLocation  = "";
+  var $section          = '';
+  var $currentLocation  = '';
 
   /*!
    * \brief Store configuration for current location
@@ -60,16 +58,15 @@ class config  {
     'SERVERS'   => array(),
     'MAIN'      => array(),
   );
-  var $basedir        = "";
+  var $basedir        = '';
 
   /* Keep a copy of the current department list */
   var $departments      = array();
   var $idepartments     = array();
   var $department_info  = array();
-  var $filename         = "";
+  var $filename         = '';
   var $last_modified    = 0;
 
-
   /*!
    * \brief Class constructor of the config class
    *
@@ -77,17 +74,16 @@ class config  {
    *
    * \param string $basedir base directory
    */
-  function __construct($filename, $basedir = "")
+  function __construct($filename, $basedir = '')
   {
     $this->basedir  = $basedir;
 
     /* Parse config file directly? */
-    if ($filename != "") {
+    if ($filename != '') {
       $this->parse($filename);
     }
   }
 
-
   /*!
    * \brief Check and reload the configuration
    *
@@ -99,29 +95,28 @@ class config  {
   {
     /* Check if class_location.inc has changed, this is the case
         if we have installed or removed plugins. */
-    $tmp = stat(CACHE_DIR."/".CLASS_CACHE);
-    if (session::global_is_set("class_location.inc:timestamp")) {
-      if ($tmp['mtime'] != session::global_get("class_location.inc:timestamp")) {
-        session::global_un_set("plist");
+    $tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
+    if (session::global_is_set('class_location.inc:timestamp')) {
+      if ($tmp['mtime'] != session::global_get('class_location.inc:timestamp')) {
+        session::global_un_set('plist');
       }
     }
-    session::global_set("class_location.inc:timestamp", $tmp['mtime']);
+    session::global_set('class_location.inc:timestamp', $tmp['mtime']);
 
-    if (($this->filename != "") && ((filemtime($this->filename) != $this->last_modified) || $force)) {
+    if (($this->filename != '') && ((filemtime($this->filename) != $this->last_modified) || $force)) {
 
       $this->config_found     = FALSE;
       $this->tags             = array();
       $this->level            = 0;
       $this->gpc              = 0;
-      $this->section          = "";
-      $this->currentLocation  = "";
+      $this->section          = '';
+      $this->currentLocation  = '';
 
       $this->parse($this->filename);
       $this->set_current($this->current['NAME']);
     }
   }
 
-
   /*!
    * \brief Parse the given configuration file
    *
@@ -134,7 +129,7 @@ class config  {
   {
     $this->last_modified  = filemtime($filename);
     $this->filename       = $filename;
-    $fh       = fopen($filename, "r");
+    $fh       = fopen($filename, 'r');
     $xmldata  = fread($fh, 100000);
     fclose($fh);
     $this->parse_data($xmldata);
@@ -162,7 +157,6 @@ class config  {
     xml_parser_free($this->parser);
   }
 
-
   /*!
    * \brief Open xml tag when parsing the xml config
    *
@@ -199,26 +193,22 @@ class config  {
 
     /* Look through attributes */
     switch ($this->tags[$this->level - 1]) {
-
       /* Handle location */
       case 'LOCATION':
         if ($this->tags[$this->level - 2] == 'MAIN') {
-          $name           = $attrs['NAME'];
-          $name           = preg_replace("/[<>\"']/", "", $name);
-          $attrs['NAME']  = $name;
+          $attrs['NAME'] = preg_replace('/[<>"\']/', '', $attrs['NAME']);
 
-          $this->currentLocation = $name;
+          $this->currentLocation = $attrs['NAME'];
 
           /* Add location elements */
-          $this->data['LOCATIONS'][$name] = $attrs;
+          $this->data['LOCATIONS'][$attrs['NAME']] = $attrs;
         }
         break;
 
       /* Handle referral tags */
       case 'REFERRAL':
         if ($this->tags[$this->level - 2] == 'LOCATION') {
-          $url    = $attrs['URI'];
-          $server = preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', $url);
+          $server = preg_replace('!^([^:]+://[^/]+)/.*$!', '\\1', $attrs['URI']);
 
           /* Add location elements */
           if (!isset($this->data['LOCATIONS'][$this->currentLocation]['REFERRAL'])) {
@@ -233,10 +223,13 @@ class config  {
       case 'MAIN':
         $this->data['MAIN'] = array_merge ($this->data['MAIN'], $attrs);
         break;
+
+      /* Ignore other tags */
+      default:
+        break;
     }
   }
 
-
   /*!
    * \brief Close xml tag when parsing the xml config
    *
@@ -253,7 +246,6 @@ class config  {
     $this->level--;
   }
 
-
   /*!
    * \brief Get the password when needed from the config file
    *
@@ -290,7 +282,6 @@ class config  {
     return $creds;
   }
 
-
   /*!
    * \brief Get a LDAP link object
    *
@@ -345,7 +336,6 @@ class config  {
     return $obj;
   }
 
-
   /*!
    * \brief Set the current location
    *
@@ -388,9 +378,6 @@ class config  {
       $this->current['BASE'] = key($bases);
     }
 
-    /* Convert BASE to have escaped special characters */
-    $this->current['BASE'] = @LDAP::convert($this->current['BASE']);
-
     /* Parse LDAP referral informations */
     if (!isset($this->current['ADMINDN']) || !isset($this->current['ADMINPASSWORD'])) {
       $url      = $this->current['SERVER'];
@@ -425,7 +412,7 @@ class config  {
 
     $debugLevel = $this->get_cfg_value('DEBUGLEVEL');
     if ($debugLevel & DEBUG_CONFIG) {
-      /* value from LDAP can't activate DEBUG_CONFIG */
+      /* Value from LDAP can't activate DEBUG_CONFIG */
       $debugLevel -= DEBUG_CONFIG;
     }
     if (isset($this->data['MAIN']['DEBUGLEVEL'])) {
@@ -440,7 +427,6 @@ class config  {
     initLanguage();
   }
 
-
   /*!
    * \brief Load server information from config/LDAP
    *
@@ -524,7 +510,10 @@ class config  {
             if (!isset($this->data['HOOKS'][$class])) {
               $this->data['HOOKS'][$class] = array('CLASS' => $parts[0]);
             }
-            $this->data['HOOKS'][$class][$mode] = $cmd;
+            if (!isset($this->data['HOOKS'][$class][$mode])) {
+              $this->data['HOOKS'][$class][$mode] = array();
+            }
+            $this->data['HOOKS'][$class][$mode][] = $cmd;
           }
         } elseif (preg_match('/^fd/', $key)) {
           if (isset($attrs[$key]['count']) && ($attrs[$key]['count'] > 1)) {
@@ -563,7 +552,7 @@ class config  {
     foreach ($types as $type) {
       $i = objects::infos($type);
       $filter         .= $i['filter'];
-      /* Specific key for departement objectTypes */
+      /* Add type main attr to fetched attributes list */
       $ldap_values[]  = $i['mainAttr'];
     }
     $filter = '(|'.$filter.')';
@@ -624,7 +613,6 @@ class config  {
       /* Add last ou element of current dn to our array */
       $last = &$arr;
       foreach ($elements as $key => $ele) {
-
         /* skip empty */
         if (empty($ele)) {
           continue;
@@ -655,7 +643,6 @@ class config  {
     $this->idepartments = $this->generateDepartmentArray($ret, -1, $max_size);
   }
 
-
   /*
    * \brief Creates display friendly output from make_idepartments
    *
@@ -681,7 +668,7 @@ class config  {
       }
 
       /* Fix name, if it contains a replace tag */
-      $name = preg_replace('/\\\\,/', ',', LDAP::fix($name));
+      $name = preg_replace('/\\\\,/', ',', $name);
 
       /* Check if current name is too long, then cut it */
       if (mb_strlen($name, 'UTF-8') > $max_size) {
@@ -707,43 +694,7 @@ class config  {
   }
 
   /*!
-   * \brief Check if there's the specified bool value set in the configuration
-   *
-   *  The function checks, weither the specified bool value is set to a true
-   *  value in the configuration file. Considered true are either true or yes,
-   *  case-insensitive.
-   *
-   *  Example usage:
-   *  \code
-   *  if ($config->boolValueIsTrue("main", "copyPaste")) {
-   *    echo "Copy Paste Handling is enabled";
-   *  }
-   *  \endcode
-   *
-   *  \param string $section Section in the configuration file.
-   *
-   *  \param string $value Key in the given section, which is subject to check
-   *
-   *  \return bool TRUE if option set in the config file
-   */
-  function boolValueIsTrue($section, $value)
-  {
-    $section  = strtoupper($section);
-    $value    = strtoupper($value);
-    if (isset($this->data[$section][$value])) {
-
-      $data = $this->data[$section][$value];
-      if (preg_match("/^true$/i", $data) || preg_match("/yes/i", $data)) {
-        return TRUE;
-      }
-
-    }
-
-    return FALSE;
-  }
-
-  /*!
-   * \brief Search for a hook
+   * \brief Search for hooks
    *
    *  Example usage:
    *  \code
@@ -753,12 +704,14 @@ class config  {
    *  \param string $class The class name
    *
    *  \param string $value Key to search in the hooks
+   *
+   *  \return array of hook commands or empty array
    */
-  function searchHook($class, $value)
+  function searchHooks($class, $value)
   {
     $class = strtoupper($class);
     $value = strtoupper($value);
-    return (isset($this->data['HOOKS'][$class][$value]) ? $this->data['HOOKS'][$class][$value] : '');
+    return (isset($this->data['HOOKS'][$class][$value]) ? $this->data['HOOKS'][$class][$value] : array());
   }
 
   /*!
@@ -778,7 +731,7 @@ class config  {
    *
    * \return string the configuration value if found or the default value
    */
-  function get_cfg_value($name, $default = "")
+  function get_cfg_value($name, $default = '')
   {
     $name = strtoupper($name);
     $res  = $default;
@@ -786,9 +739,9 @@ class config  {
     /* Check if we have a current value for $name */
     if (isset($this->current[$name])) {
       $res = $this->current[$name];
-    } elseif (isset($this->data["MAIN"][$name])) {
+    } elseif (isset($this->data['MAIN'][$name])) {
       /* Check if we have a global value for $name */
-      $res = $this->data["MAIN"][$name];
+      $res = $this->data['MAIN'][$name];
     }
 
     if (is_array($default) && !is_array($res)) {
@@ -798,7 +751,6 @@ class config  {
     return $res;
   }
 
-
   /*!
    * \brief Check if session lifetime matches session.gc_maxlifetime
    *
@@ -824,7 +776,6 @@ class config  {
     }
   }
 
-
   /*!
    * \brief Check if snapshot are enabled
    *
@@ -832,38 +783,36 @@ class config  {
    */
   function snapshotEnabled()
   {
-    if ($this->get_cfg_value("enableSnapshots") == "TRUE") {
-
-      /* Check if the snapshot_base is defined */
-      if ($this->get_cfg_value("snapshotBase") == "") {
+    if ($this->get_cfg_value('enableSnapshots') != 'TRUE') {
+      return FALSE;
+    }
 
-        /* Send message if not done already */
-        if (!session::is_set("snapshotFailMessageSend")) {
-          session::set("snapshotFailMessageSend", TRUE);
-          msg_dialog::display(_("Configuration error"),
-              sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."),
-                      "snapshotBase"), ERROR_DIALOG);
-        }
-        return FALSE;
+    /* Check if the snapshot_base is defined */
+    if ($this->get_cfg_value('snapshotBase') == '') {
+      /* Send message if not done already */
+      if (!session::is_set('snapshotFailMessageSend')) {
+        session::set('snapshotFailMessageSend', TRUE);
+        msg_dialog::display(_('Configuration error'),
+            sprintf(_('The snapshot functionality is enabled, but the required variable "%s" is not set.'),
+                    'snapshotBase'), ERROR_DIALOG);
       }
+      return FALSE;
+    }
 
-      /* Check if gzcompress is available */
-      if (!is_callable("gzcompress")) {
-
-        /* Send message if not done already */
-        if (!session::is_set("snapshotFailMessageSend")) {
-          session::set("snapshotFailMessageSend", TRUE);
-          msg_dialog::display(_("Configuration error"),
-              sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install '%s'."), "php5-zip / php5-gzip"), ERROR_DIALOG);
-        }
-        return FALSE;
+    /* Check if gzcompress is available */
+    if (!is_callable('gzcompress')) {
+      /* Send message if not done already */
+      if (!session::is_set('snapshotFailMessageSend')) {
+        session::set('snapshotFailMessageSend', TRUE);
+        msg_dialog::display(_('Configuration error'),
+            sprintf(_('The snapshot functionality is enabled, but the required compression module is missing. Please install "%s".'), 'php5-zip / php5-gzip'), ERROR_DIALOG);
       }
-      return TRUE;
+      return FALSE;
     }
-    return FALSE;
+    return TRUE;
   }
 
-  function loadPlist ($plist)
+  function loadPlist (pluglist $plist)
   {
     $this->data['OBJECTS']    = array();
     $this->data['SECTIONS']   = array();
@@ -886,12 +835,14 @@ class config  {
             }
             $this->data['TABS'][$tabclass][] = $entry;
           } else {
+            /* This is the main tab */
             if (isset($this->data['OBJECTS'][strtoupper($key)])) {
               die("duplicated object type ".strtoupper($key)." in ".$this->data['OBJECTS'][strtoupper($key)]['mainTab']." and $class");
             }
             $tabclass = strtoupper($key)."TABS";
-            $value['tabGroup']  = $tabclass;
-            $value['mainTab']   = $class;
+            $value['tabGroup']        = $tabclass;
+            $value['mainTab']         = $class;
+            $value['templateActive']  = FALSE;
             foreach (array('ou', 'tabClass') as $i) {
               if (!isset($value[$i])) {
                 $value[$i] = NULL;
@@ -939,7 +890,7 @@ class config  {
         /* Walk through supplied list and feed only translated categories */
         $cats = array();
         foreach ($plInfo['plCategory'] as $idx => $data) {
-          $cat    = (is_numeric($idx)?$data:$idx);
+          $cat    = (is_numeric($idx) ? $data : $idx);
           $cats[] = $cat;
           if (!isset($this->data['CATEGORIES'][$cat])) {
             $this->data['CATEGORIES'][$cat] = array( 'classes' => array('0') );
@@ -995,6 +946,7 @@ class config  {
             /* This is not the main tab */
             $obj = strtoupper($value);
           } else {
+            /* This is the main tab */
             $obj = strtoupper($key);
           }
           /* if this is an existing objectType, not just a tab group */
@@ -1030,6 +982,9 @@ 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;
+            }
           }
         }
       }
@@ -1113,5 +1068,4 @@ class config  {
     );
   }
 }
-
 ?>
diff --git a/include/class_departmentSortIterator.inc b/include/class_departmentSortIterator.inc
index 96e5362dc5e5c9ae34830fb8589312fba387c6a4..f749e2e68a8a34a1eb6d8ede9ea61b0048d750d9 100644
--- a/include/class_departmentSortIterator.inc
+++ b/include/class_departmentSortIterator.inc
@@ -27,9 +27,7 @@
 /*!
  * \brief This class contains all the function needed to sort department
  */
-class departmentSortIterator implements Iterator {
-  private $data;
-
+class departmentSortIterator extends listingSortIterator {
   /*!
    * \brief departmentSortIterator constructor
    *
@@ -39,91 +37,7 @@ class departmentSortIterator implements Iterator {
    */
   public function __construct($data, $direction)
   {
-    // Sort for attribute
-    uasort(
-      $data,
-      function ($ao, $bo)
-      {
-        // Override sort attribute from data if needed
-        $attribute_a = $ao['sort-attribute'];
-        $attribute_b = $bo['sort-attribute'];
-
-        // Extract values from ao and bo
-        $a = $b = "";
-        if (isset($ao[$attribute_a])) {
-          $a = $ao[$attribute_a];
-          if (is_array($a)) {
-            $a = $a[0];
-          }
-        }
-        if (isset($bo[$attribute_b])) {
-          $b = $bo[$attribute_b];
-          if (is_array($b)) {
-            $b = $b[0];
-          }
-        }
-
-        // Sort for string by default
-        return strnatcmp($a, $b);
-      }
-    );
-
-    // Invert if direction is set
-    if ($direction) {
-      $this->data = array_reverse($data, TRUE);
-    } else {
-      $this->data = $data;
-    }
-  }
-
-  /*!
-   * \brief Put the array pointer to the first element
-   *
-   * \return the first element of the array
-   */
-  function rewind()
-  {
-    return reset($this->data);
-  }
-
-  /*!
-   * \brief Get the current data element
-   *
-   * \return The current element pointed by array pointer
-   */
-  function current()
-  {
-    return current($this->data);
-  }
-
-  /*!
-   * \brief Get the key element
-   *
-   * \return the key element of the array
-   */
-  function key()
-  {
-    return key($this->data);
-  }
-
-  /*!
-   * \brief Get the next data element
-   *
-   * \return The next element pointed by array pointer
-   */
-  function next()
-  {
-    return next($this->data);
-  }
-
-  /*!
-   * \brief Check if the data array is valid
-   *
-   * \return TRUE if the array is valid, return FALSE otherwise
-   */
-  function valid()
-  {
-    return (key($this->data) !== NULL);
+    parent::__construct($data, $direction, 'sort-attribute', 'department');
   }
 }
 ?>
diff --git a/include/class_filter.inc b/include/class_filter.inc
index b26089ecc94ce9b503b7f6f33c4e9ed810810401..4133687a9f9a700a7e162928c62e0808e113aa20 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -34,13 +34,13 @@ class filter
   var $elementValues    = array();
   var $alphabetElements = array();
   var $autocompleter    = array();
-  var $category         = "";
+  var $category         = '';
   var $objectStorage    = array();
-  var $base             = "";
-  var $scope            = "";
+  var $base             = '';
+  var $scope            = '';
   var $query;
   var $initial          = FALSE;
-  var $scopeMode        = "auto";
+  var $scopeMode        = 'auto';
   var $alphabet         = NULL;
   var $converter        = array();
   var $pid;
@@ -71,33 +71,25 @@ class filter
     $contents       = file_get_contents($filename);
     $this->xmlData  = xml::xml2array($contents, 1);
 
-    if (!isset($this->xmlData['filterdef'])) {
+    if (!isset($this->xmlData['filterdef']['search'])) {
       return FALSE;
     }
 
-    $this->xmlData = $this->xmlData["filterdef"];
+    $this->xmlData = $this->xmlData['filterdef'];
 
     // Load filter
-    if (isset($this->xmlData['search'])) {
-      if (!isset($this->xmlData['search']['query'][0])) {
-        $this->xmlData['search']['query'] = array($this->xmlData['search']['query']);
-      }
-
-      // Move information
-      $entry            = $this->xmlData['search'];
-      $this->scopeMode  = $entry['scope'];
-      if ($entry['scope'] == "auto") {
-        $this->scope = "one";
-      } else {
-        $this->scope = $entry['scope'];
-      }
-      $this->query = $entry['query'];
-    } else {
-      return FALSE;
+    if (!isset($this->xmlData['search']['query'][0])) {
+      $this->xmlData['search']['query'] = array($this->xmlData['search']['query']);
     }
 
+    // Move information
+    $entry            = $this->xmlData['search'];
+    $this->scopeMode  = $entry['scope'];
+    $this->scope      = ($entry['scope'] == 'auto' ? 'one' : $entry['scope']);
+    $this->query      = $entry['query'];
+
     // Transfer initial value
-    if (isset($this->xmlData['definition']['initial']) && ($this->xmlData['definition']['initial'] == "true")) {
+    if (isset($this->xmlData['definition']['initial']) && ($this->xmlData['definition']['initial'] == 'true')) {
       $this->initial = TRUE;
     }
 
@@ -112,7 +104,6 @@ class filter
         $this->xmlData['element'] = array($this->xmlData['element']);
       }
       foreach ($this->xmlData['element'] as $element) {
-
         // Ignore elements without type
         if (!isset($element['type']) || !isset($element['tag'])) {
           continue;
@@ -132,18 +123,17 @@ class filter
         if (isset($element['default']) && !is_array($element['default'])) {
           $this->elementValues[$tag] = $element['default'];
         } else {
-          $this->elementValues[$tag] = "";
+          $this->elementValues[$tag] = '';
         }
 
         // Does this element react on alphabet links?
-        if (isset($element['alphabet']) && $element['alphabet'] == "true") {
+        if (isset($element['alphabet']) && ($element['alphabet'] == 'true')) {
           $this->alphabetElements[] = $tag;
         }
       }
 
       uasort($this->elements, 'strlenSort');
       $this->elements = array_reverse($this->elements);
-
     }
 
     return TRUE;
@@ -360,7 +350,7 @@ class filter
    */
   function renderScope()
   {
-    $checked = ($this->scope == "sub"?" checked":"");
+    $checked = ($this->scope == 'sub' ? ' checked' : '');
     return "<input type='checkbox' id='SCOPE' name='SCOPE' value='1' onClick='document.mainform.submit();'$checked>&nbsp;<LABEL for='SCOPE'>"._("Search in subtrees")."</LABEL>";
   }
 
@@ -430,13 +420,13 @@ class filter
     // Go thru all queries and merge results
     foreach ($this->query as $query) {
       if (!isset($query['backend']) || !isset($query['filter']) || !isset($query['attribute'])) {
-        die("No backend specified in search config.");
+        die('No backend specified in search config.');
       }
 
       // Is backend available?
-      $backend = "filter".$query['backend'];
+      $backend = 'filter'.$query['backend'];
       if (!isset($class_mapping["$backend"])) {
-        die("Invalid backend specified in search config.");
+        die('Invalid backend specified in search config.');
       }
 
       // Load filter and attributes
@@ -464,15 +454,15 @@ class filter
         // Handle converters if present
         if (isset($this->converter[$tag])) {
           preg_match('/([^:]+)::(.*)$/', $this->converter[$tag], $m);
-          $e_set    = call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['set'])?"":$element['set']));
-          $e_unset  = call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['unset'])?"":$element['unset']));
+          $e_set    = call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['set']) ? '' : $element['set']));
+          $e_unset  = call_user_func(array($m[1], $m[2]), preg_replace('/\$/', $this->elementValues[$tag], is_array($element['unset']) ? '' : $element['unset']));
         } else {
-          $e_set    = is_array($element['set'])?"":$element['set'];
-          $e_unset  = is_array($element['unset'])?"":$element['unset'];
+          $e_set    = (is_array($element['set']) ? '' : $element['set']);
+          $e_unset  = (is_array($element['unset']) ? '' : $element['unset']);
         }
 
         // Do not replace escaped \$ - This is required to be able to search for e.g. windows machines.
-        if ($this->elementValues[$tag] == "") {
+        if ($this->elementValues[$tag] == '') {
           $e_unset  = preg_replace('/([^\\\\])\$/', '${1}'.ldap_escape_f($this->elementValues[$tag]), $e_unset);
           $e_unset  = preg_replace('/\\\\\$/', '$', $e_unset);
           $filter   = preg_replace("/\\$$tag/", $e_unset, $filter);
@@ -483,9 +473,15 @@ 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));
+      }
+
       // 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, $this->objectStorage));
+            $this, $this->base, $this->scope, $filter, $attributes, $this->category, $objectStorage));
     }
 
     return $result;
@@ -533,8 +529,8 @@ class filter
       }
 
       // Save scope if needed
-      if ($this->scopeMode == "auto") {
-        $this->scope = (isset($_POST['SCOPE'])?"sub":"one");
+      if ($this->scopeMode == 'auto') {
+        $this->scope = (isset($_POST['SCOPE']) ? 'sub' : 'one');
       }
     }
 
diff --git a/include/class_filterLDAP.inc b/include/class_filterLDAP.inc
index 1052dae3a098ffc7dc817d41df709c3136aca0a6..e9ce2ad8b03ba4d2351bad9b8ab0276c8f2cf7db 100644
--- a/include/class_filterLDAP.inc
+++ b/include/class_filterLDAP.inc
@@ -50,8 +50,7 @@ class filterLDAP
    */
   static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = array(""))
   {
-    $flag   = (($scope == 'sub') ? GL_SUBSEARCH : 0);
-    return static::get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
+    return static::get_list($parent, $base, $filter, $attributes, $category, $objectStorage, (($scope == 'sub') ? 'subtree' : 'one'), TRUE);
   }
 
   /*!
@@ -69,9 +68,13 @@ class filterLDAP
    *
    * \param array $objectStorage
    *
-   * \param flag $flags GL_SUBSEARCH
+   * \param string $scope subtree or one
+   *
+   * \param boolean $sizelimit
+   *
+   * \param boolean $checkAcl
    */
-  static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flags)
+  static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $scope, $sizelimit = TRUE, $checkAcl = FALSE)
   {
     global $config, $ui;
 
@@ -80,53 +83,47 @@ class filterLDAP
       $category = array($category);
     }
 
-    // Store in base - i.e. is a rdn value empty?
-    $storeOnBase = in_array('', $objectStorage);
-
-    $default_method = (($storeOnBase && !($flags & GL_SUBSEARCH)) ? 'ls' : 'search');
-
     // Initialize search bases
     $bases = array();
 
-    // Get list of sub bases to search on
-    if ($storeOnBase) {
-      $bases[$base] = "";
-    } else {
-      foreach ($objectStorage as $oc) {
-        $oc = preg_replace('/,$/', '', $oc);
-        if (!strpos($oc, ',')) {
-          preg_match('/([^=]+)=(.*)$/', $oc, $m);
-          if ($flags & GL_SUBSEARCH) {
-            $bases[$base][] = $m[1].":dn:=".$m[2];
-          } else {
-            $bases["$oc,$base"][] = $m[1].":dn:=".$m[2];
-          }
+    foreach ($objectStorage as $oc) {
+      $oc = preg_replace('/,$/', '', $oc);
+      if ($scope == 'one') {
+        if (empty($oc)) {
+          $bases[$base] = TRUE;
         } else {
-          // No, there's no \, in pre defined RDN values
-          preg_match('/^([^,]+),(.*)$/', $oc, $matches);
-          preg_match('/([^=]+)=(.*)$/', $matches[1], $m);
-          if ($flags & GL_SUBSEARCH) {
-            $bases[$base][] = $m[1].":dn:=".$m[2];
-          } else {
-            $bases[$matches[2].",$base"][] = $m[1].":dn:=".$m[2];
-          }
+          $bases[$oc.','.$base] = TRUE;
+        }
+      } else {
+        if (empty($oc)) {
+          /* If we search on the base as well because of an empty storage string,
+           * it makes no sense to do dn filters */
+          $bases[$base] = TRUE;
+          break;
+        }
+        $parts    = ldap_explode_dn($oc, 0);
+        unset($parts['count']);
+        $dnFilter = array();
+        foreach ($parts as $part) {
+          preg_match('/([^=]+)=(.*)$/', $part, $m);
+          $dnFilter[] = '('.$m[1].':dn:='.$m[2].')';
+        }
+        if (count($dnFilter) > 1) {
+          $bases[$base][] = '(&'.implode('', $dnFilter).')';
+        } else {
+          $bases[$base][] = $dnFilter[0];
         }
       }
     }
 
     // Get LDAP link
-    $ldap = $config->get_ldap_link($flags & GL_SIZELIMIT);
+    $ldap = $config->get_ldap_link($sizelimit);
 
     // Do search for every base
     $result = array();
     $limit_exceeded = FALSE;
 
-    // Save initial selected base for comparison purposes
-    $initial_base = $base;
-
     foreach ($bases as $base => $dnFilters) {
-      $method = $default_method;
-
       // Break if the size limit is exceeded
       if ($limit_exceeded) {
         return $result;
@@ -134,27 +131,13 @@ class filterLDAP
 
       // Switch to new base and search
       if (is_array($dnFilters)) {
-        $dnFilter = "(|";
-        foreach ($dnFilters as $df) {
-          $dnFilter .= "($df)";
-        }
-        $dnFilter .= ")";
+        $dnFilter = '(|'.implode('', $dnFilters).')';
       } else {
-        $dnFilter = "";
+        $dnFilter = '';
       }
       $ldap->cd($base);
 
-      // In no-subsearch mode overwrite default method if
-      // current base equals the initial base
-      if ($base == $initial_base && !($flags & GL_SUBSEARCH)) {
-        $method = "ls";
-      }
-
-      if ($method == "ls") {
-        $ldap->ls("(&$filter$dnFilter)", $base, $attributes);
-      } else {
-        $ldap->search("(&$filter$dnFilter)", $attributes);
-      }
+      $ldap->search('(&'.$filter.$dnFilter.')', $attributes, $scope);
 
       // Check for size limit exceeded messages for GUI feedback
       if (preg_match("/size limit/i", $ldap->get_error())) {
@@ -168,7 +151,7 @@ class filterLDAP
         $dn = $attrs['dn'];
 
         /* Skip ACL checks if we are forced to skip those checks */
-        if ($flags & GL_NO_ACL_CHECK) {
+        if (!$checkAcl) {
           $result[] = $attrs;
         } else {
           // Check entry permission
@@ -183,7 +166,6 @@ class filterLDAP
           }
         }
       }
-
     }
 
     return $result;
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index c12693dcc3157fc5131d54793c1fcecf56bb93d0..65076b294eba51392a3cf979d2f50482619bd81a 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
@@ -27,8 +26,6 @@
  * Source code for Class LDAP
  */
 
-define("SPECIALS_OVERRIDE", FALSE);
-
 /*!
  * \brief This class contains all ldap function needed to make
  * ldap operations easy
@@ -39,26 +36,33 @@ class LDAP
   var $hascon         = FALSE;
   var $reconnect      = FALSE;
   var $tls            = FALSE;
+
   /* connection identifier */
   var $cid;
+
   var $hasres         = array();
   var $sr             = array();
   var $re             = array();
   var $basedn         = "";
+
   /* 0 if we are fetching the first entry, otherwise 1 */
   var $start          = array();
+
   /* Any error messages to be returned can be put here */
   var $error          = "";
+
   var $srp            = 0;
+
   /* Information read from slapd.oc.conf */
   var $objectClasses    = array();
   /* the dn for the bind */
-  var $binddn         = "";
+  var $binddn           = "";
   /* the dn's password for the bind */
-  var $bindpw         = "";
-  var $hostname       = "";
-  var $follow_referral    = FALSE;
-  var $referrals      = array();
+  var $bindpw           = "";
+  var $hostname         = "";
+  var $follow_referral  = FALSE;
+  var $referrals        = array();
+
   /* 0, empty or negative values will disable this check */
   var $max_ldap_query_time  = 0;
 
@@ -80,7 +84,7 @@ class LDAP
     global $config;
     $this->follow_referral  = $follow_referral;
     $this->tls              = $tls;
-    $this->binddn           = LDAP::convert($binddn);
+    $this->binddn           = $binddn;
     $this->bindpw           = $bindpw;
     $this->hostname         = $hostname;
 
@@ -106,67 +110,6 @@ class LDAP
     return $this->srp++;
   }
 
-  /*! \brief Function to replace all problematic characters inside a DN by \001XX
-   *
-   * Function to replace all problematic characters inside a DN by \001XX, where
-   * \001 is decoded to chr(1) [ctrl+a]. It is not impossible, but very unlikely
-   * that this character is inside a DN.
-   *
-   * Currently used codes:
-   * \code
-   * ,   => CO
-   * \2C => CO
-   * (   => OB
-   * )   => CB
-   * /   => SL
-   * "   => DQ
-   * \22 => DQ
-   * \endcode
-   *
-   * \param string $dn The DN
-   *
-   * \return String, the corrected DN
-   */
-  static function convert($dn)
-  {
-    if (SPECIALS_OVERRIDE == TRUE) {
-      $tmp = preg_replace(
-          array("/\\\\,/", "/\\\\2C/", "/\(/", "/\)/", "/\//", "/\\\\22/", '/\\\\"/'),
-          array("\001CO", "\001CO", "\001OB", "\001CB", "\001SL", "\001DQ", "\001DQ"),
-          $dn
-      );
-      return preg_replace('/,\s+/', ',', $tmp);
-    } else {
-      return $dn;
-    }
-  }
-
-  /*!
-   * \brief Function to fix all problematic characters inside a DN DN by replacing \001XX codes
-   * to their original values
-   *
-   * Function to fix all problematic characters inside a DN by replacing \001XX codes
-   * to their original values. See "convert" for more information.
-   * ',' characters are always expanded to \, (not \2C), since all tested LDAP servers
-   * seem to take it the correct way.
-   *
-   * \param string $dn The DN
-   *
-   * \return String, the fixed DN
-   */
-  static function fix($dn)
-  {
-    if (SPECIALS_OVERRIDE == TRUE) {
-      return preg_replace(
-        array("/\001CO/", "/\001OB/", "/\001CB/", "/\001SL/", "/\001DQ/"),
-        array("\,", "(", ")", "/", '\"'),
-        $dn
-      );
-    } else {
-      return $dn;
-    }
-  }
-
   /*!
    * \brief Function to fix problematic characters in DN's that are used for search requests. I.e. member=....
    *
@@ -198,7 +141,7 @@ class LDAP
       }
 
       $this->error = "No Error";
-      if (@ldap_bind($this->cid, LDAP::fix($this->binddn), $this->bindpw)) {
+      if (@ldap_bind($this->cid, $this->binddn, $this->bindpw)) {
         $this->error  = "Success";
         $this->hascon = TRUE;
       } else {
@@ -221,7 +164,7 @@ class LDAP
   function rebind($ldap, $referral)
   {
     $credentials = $this->get_credentials($referral);
-    if (@ldap_bind($ldap, LDAP::fix($credentials['ADMINDN']), $credentials['ADMINPASSWORD'])) {
+    if (@ldap_bind($ldap, $credentials['ADMINDN'], $credentials['ADMINPASSWORD'])) {
       $this->error      = "Success";
       $this->hascon     = TRUE;
       $this->reconnect  = TRUE;
@@ -269,10 +212,10 @@ class LDAP
    */
   function cd($dir)
   {
-    if ($dir == "..") {
+    if ($dir == '..') {
       $this->basedn = $this->getParentDir();
     } else {
-      $this->basedn = LDAP::convert($dir);
+      $this->basedn = $dir;
     }
   }
 
@@ -283,12 +226,10 @@ class LDAP
    *
    * \return String, the parent directory
    */
-  function getParentDir($basedn = "")
+  function getParentDir($basedn = '')
   {
-    if ($basedn == "") {
+    if ($basedn == '') {
       $basedn = $this->basedn;
-    } else {
-      $basedn = LDAP::convert($basedn);
     }
     return preg_replace("/[^,]*[,]*[ ]*(.*)/", "$1", $basedn);
   }
@@ -302,7 +243,7 @@ class LDAP
    *
    * \param array $attrs
    */
-  function search($srp, $filter, $attrs = array())
+  function search($srp, $filter, $attrs = array(), $scope = 'subtree')
   {
     if ($this->hascon) {
       if ($this->reconnect) {
@@ -311,7 +252,17 @@ class LDAP
 
       $start = microtime(TRUE);
       $this->clearResult($srp);
-      $this->sr[$srp] = @ldap_search($this->cid, LDAP::fix($this->basedn), $filter, $attrs);
+      switch (strtolower($scope)) {
+        case 'base':
+          throw new FusionDirectoryException('not implemented');
+        case 'one':
+          $this->sr[$srp] = @ldap_list($this->cid, $this->basedn, $filter, $attrs);
+        break;
+        default:
+        case 'subtree':
+          $this->sr[$srp] = @ldap_search($this->cid, $this->basedn, $filter, $attrs);
+          break;
+      }
       $this->error = @ldap_error($this->cid);
       $this->resetResult($srp);
       $this->hasres[$srp] = TRUE;
@@ -324,7 +275,7 @@ class LDAP
         }
       }
 
-      $this->log("LDAP operation: time=".(microtime(TRUE) - $start)." operation=search('".LDAP::fix($this->basedn)."', '$filter')");
+      $this->log("LDAP operation: time=".(microtime(TRUE) - $start)." operation=search('".$this->basedn."', '$filter')");
       return $this->sr[$srp];
     } else {
       $this->error = "Could not connect to LDAP server";
@@ -345,39 +296,9 @@ class LDAP
    */
   function ls($srp, $filter = "(objectclass=*)", $basedn = "", $attrs = array("*"))
   {
-    if ($this->hascon) {
-      if ($this->reconnect) {
-        $this->connect();
-      }
-
-      $this->clearResult($srp);
-      if ($basedn == "") {
-        $basedn = $this->basedn;
-      } else {
-        $basedn = LDAP::convert($basedn);
-      }
-
-      $start          = microtime(TRUE);
-      $this->sr[$srp] = @ldap_list($this->cid, LDAP::fix($basedn), $filter, $attrs);
-      $this->error    = @ldap_error($this->cid);
-      $this->resetResult($srp);
-      $this->hasres[$srp] = TRUE;
-
-       /* Check if query took longer as specified in max_ldap_query_time */
-      if ($this->max_ldap_query_time) {
-        $diff = microtime(TRUE) - $start;
-        if ($diff > $this->max_ldap_query_time) {
-          msg_dialog::display(_("Performance warning"), sprintf(_("LDAP performance is poor: last query took about %.2fs!"), $diff), WARNING_DIALOG);
-        }
-      }
-
-      $this->log("LDAP operation: time=".(microtime(TRUE) - $start)." operation=ls('".LDAP::fix($basedn)."', '$filter')");
-
-      return $this->sr[$srp];
-    } else {
-      $this->error = "Could not connect to LDAP server";
-      return "";
-    }
+    trigger_error('deprecated');
+    $this->cd($basedn);
+    return $this->search($srp, $filter, $attrs, 'one');
   }
 
   /*
@@ -399,7 +320,7 @@ class LDAP
       }
 
       $this->clearResult($srp);
-      $this->sr[$srp] = @ldap_read($this->cid, LDAP::fix($dn), $filter, $attrs);
+      $this->sr[$srp] = @ldap_read($this->cid, $dn, $filter, $attrs);
       $this->error    = @ldap_error($this->cid);
       $this->resetResult($srp);
       $this->hasres[$srp] = TRUE;
@@ -423,7 +344,7 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-      $res  = @ldap_read($this->cid, LDAP::fix($dn), $filter, array("objectClass"));
+      $res  = @ldap_read($this->cid, $dn, $filter, array("objectClass"));
       $rv   = @ldap_count_entries($this->cid, $res);
       return $rv;
     } else {
@@ -472,7 +393,7 @@ class LDAP
         }
         if ($this->re[$srp]) {
           $att        = @ldap_get_attributes($this->cid, $this->re[$srp]);
-          $att['dn']  = trim(LDAP::convert(@ldap_get_dn($this->cid, $this->re[$srp])));
+          $att['dn']  = trim(@ldap_get_dn($this->cid, $this->re[$srp]));
         }
         $this->error = @ldap_error($this->cid);
         if (!isset($att)) {
@@ -527,7 +448,7 @@ class LDAP
           $rv = @ldap_get_dn($this->cid, $this->re[$srp]);
 
           $this->error = @ldap_error($this->cid);
-          return trim(LDAP::convert($rv));
+          return trim($rv);
         }
       } else {
         $this->error = "Perform a Fetch with no Search";
@@ -575,17 +496,16 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-
-      if ($dn == "") {
+      if ($dn == '') {
         $dn = $this->basedn;
       }
 
-      $r = ldap_mod_del($this->cid, LDAP::fix($dn), $attrs);
+      $r = ldap_mod_del($this->cid, $dn, $attrs);
       $this->error = @ldap_error($this->cid);
       return $r;
     } else {
-      $this->error = "Could not connect to LDAP server";
-      return "";
+      $this->error = 'Could not connect to LDAP server';
+      return '';
     }
   }
 
@@ -595,12 +515,11 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-
       if ($dn == "") {
         $dn = $this->basedn;
       }
 
-      $r = @ldap_mod_add($this->cid, LDAP::fix($dn), $attrs);
+      $r = @ldap_mod_add($this->cid, $dn, $attrs);
       $this->error = @ldap_error($this->cid);
       return $r;
     } else {
@@ -620,8 +539,7 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-
-      $r = @ldap_delete($this->cid, LDAP::fix($deletedn));
+      $r = @ldap_delete($this->cid, $deletedn);
       $this->error = @ldap_error($this->cid);
       return ($r ? $r : 0);
     } else {
@@ -668,8 +586,7 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-
-      $r = ldap_rename($this->cid, @LDAP::fix($source), @LDAP::fix($dest_rdn), @LDAP::fix($parent), FALSE);
+      $r = ldap_rename($this->cid, $source, $dest_rdn, $parent, FALSE);
       $this->error = ldap_error($this->cid);
 
       /* Check if destination dn exists, if not the
@@ -686,7 +603,7 @@ class LDAP
   /*!
    * \brief Function rmdir_recursive
    *
-   * Recursive remove, with full subtree remove, and delete own node.
+   * Based on recursive_remove, adding two thing: full subtree remove, and delete own node.
    *
    * \param $srp srp
    *
@@ -762,7 +679,7 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-      $r = @ldap_modify($this->cid, LDAP::fix($this->basedn), $attrs);
+      $r = @ldap_modify($this->cid, $this->basedn, $attrs);
       $this->error = @ldap_error($this->cid);
       if (!$this->success()) {
         $this->error .= $this->makeReadableErrors($this->error, $attrs);
@@ -785,7 +702,7 @@ class LDAP
       if ($this->reconnect) {
         $this->connect();
       }
-      $r = @ldap_add($this->cid, LDAP::fix($this->basedn), $attrs);
+      $r = @ldap_add($this->cid, $this->basedn, $attrs);
       $this->error = @ldap_error($this->cid);
       if (!$this->success()) {
         $this->error .= $this->makeReadableErrors($this->error, $attrs);
@@ -809,7 +726,7 @@ class LDAP
     if ($target == $this->basedn) {
       $l = array("dummy");
     } else {
-      $l = array_reverse(gosa_ldap_explode_dn($real_path));
+      $l = array_reverse(ldap_explode_dn($real_path, 0));
     }
     unset($l['count']);
     $cdn = $this->basedn;
@@ -843,7 +760,7 @@ class LDAP
       /* Create missing entry? */
       if (!count($attrs)) {
         $type   = preg_replace('/^([^=]+)=.*$/', '\\1', $cdn);
-        $param  = LDAP::fix(preg_replace('/^[^=]+=([^,]+).*$/', '\\1', $cdn));
+        $param  = preg_replace('/^[^=]+=([^,]+).*$/', '\\1', $cdn);
         $param  = preg_replace(array('/\\\\,/','/\\\\"/'), array(',','"'), $param);
 
         $na = array();
@@ -886,7 +803,7 @@ class LDAP
           }
           $na[$type] = $param;
 
-          /* Fill in MUST values - but do not overwrite existing ones. */
+          // 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])) {
@@ -945,7 +862,7 @@ class LDAP
     if ($this->reconnect) {
       $this->connect();
     }
-    $sr = @ldap_read($this->cid, LDAP::fix($dn), "objectClass=*", array("$name"));
+    $sr = @ldap_read($this->cid, $dn, "objectClass=*", array("$name"));
 
     /* fill data from LDAP */
     if ($sr) {
@@ -1017,7 +934,7 @@ class LDAP
     if (isset($referrals[$server])) {
       return $referrals[$server];
     } else {
-      $ret['ADMINDN']       = LDAP::fix($this->binddn);
+      $ret['ADMINDN']       = $this->binddn;
       $ret['ADMINPASSWORD'] = $this->bindpw;
     }
 
@@ -1094,14 +1011,11 @@ class LDAP
     return $res;
   }
 
-
   function dn_exists($dn)
   {
-    return @ldap_list($this->cid, LDAP::fix($dn), "(objectClass=*)", array("objectClass"));
+    return @ldap_read($this->cid, $dn, "(objectClass=*)", array("objectClass"));
   }
 
-
-
   /*!
    * \brief Function to imports ldifs
    *
@@ -1141,7 +1055,6 @@ class LDAP
         $line .= substr($fileLine, 1);
       } elseif (preg_match('/^#/', $fileLine)) {
         /* Ignore comment */
-        // TODO handle folded comment
       } elseif (preg_match('/^version:/', $fileLine) && empty($entry)) {
         /* Ignore version number */
       } else {
@@ -1232,7 +1145,7 @@ class LDAP
     /* If dn is an index of data, we should try to insert the data */
     if (isset($data['dn'])) {
       /* Fix dn */
-      $tmp = gosa_ldap_explode_dn($data['dn']);
+      $tmp = ldap_explode_dn($data['dn'], 0);
       unset($tmp['count']);
       $dn = '';
       foreach ($tmp as $tm) {
@@ -1433,53 +1346,21 @@ class LDAP
     }
   }
 
-
-  function get_naming_contexts($server, $admin = "", $password = "")
+  function get_naming_contexts($server, $admin = '', $password = '')
   {
     /* Build LDAP connection */
     $ds = ldap_connect ($server);
     if (!$ds) {
-      die ("Can't bind to LDAP. No check possible!");
+      die ('Can\'t bind to LDAP. No check possible!');
     }
     ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
     ldap_bind ($ds, $admin, $password);
 
     /* Get base to look for naming contexts */
-    $sr   = @ldap_read ($ds, "", "objectClass=*", array("+"));
+    $sr   = @ldap_read ($ds, '', 'objectClass=*', array('namingContexts'));
     $attr = @ldap_get_entries($ds, $sr);
 
     return $attr[0]['namingcontexts'];
   }
-
-
-  function get_root_dse($server, $admin = "", $password = "")
-  {
-    /* Build LDAP connection */
-    $ds = ldap_connect ($server);
-    if (!$ds) {
-      die ("Can't bind to LDAP. No check possible!");
-    }
-    ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-    ldap_bind ($ds, $admin, $password);
-
-    /* Get base to look for naming contexts */
-    $sr   = @ldap_read ($ds, "", "objectClass=*", array("+"));
-    $attr = @ldap_get_entries($ds, $sr);
-
-    /* Return empty array, if nothing was set */
-    if (!isset($attr[0])) {
-      return array();
-    }
-
-    /* Rework array... */
-    $result = array();
-    for ($i = 0; $i < $attr[0]['count']; $i++) {
-      $result[$attr[0][$i]] = $attr[0][$attr[0][$i]];
-      unset($result[$attr[0][$i]]['count']);
-    }
-
-    return $result;
-  }
-
 }
 ?>
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 0b752db39496156400d671baf0585d95ddbb77e5..2d2c0b4eaddf322f640a031f03bfd6c30afa7a33 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -59,7 +59,6 @@ class listing
   protected $snapshotHandler  = NULL;
   var $exporter       = array();
   var $exportColumns  = array();
-  var $useSpan        = FALSE;
   var $height         = 0;
   var $scrollPosition = 0;
   var $baseSelector;
@@ -233,7 +232,7 @@ class listing
         'image'       => $i['icon'],
         'category'    => $i['aclCategory'],
         'class'       => $i['mainTab'],
-        'filter'      => ldapFilter::parse($i['filter']),
+        'filter'      => objects::getFilterObject($type),
         'nameAttr'    => $i['nameAttr'],
       );
     }
@@ -340,58 +339,42 @@ class listing
   function render()
   {
     // Check for exeeded sizelimit
-    if (($message = check_sizelimit()) != "") {
+    if (($message = check_sizelimit()) != '') {
       return $message;
     }
 
-    // Some browsers don't have the ability do do scrollable table bodies, filter them
-    // here.
-    $switch = FALSE;
-    if (preg_match('/(Opera|Konqueror|Safari)/i', $_SERVER['HTTP_USER_AGENT'])) {
-      $switch = TRUE;
-    }
-
     // Initialize list
-    $result = "<input type='hidden' value='$this->pid' name='PID'>\n";
-    $result .= "<input type='hidden' name='position_".$this->pid."' id='position_".$this->pid."'>\n";
+    $result = '<input type="hidden" value="'.$this->pid.'" name="PID"/>'."\n";
+    $result .= '<input type="hidden" name="position_'.$this->pid.'" id="position_'.$this->pid.'"/>'."\n";
     $height = 450;
     if ($this->height != 0) {
-      $result .= "<input type='hidden' value='$this->height' id='d_height'>\n";
+      $result .= '<input type="hidden" value="'.$this->height.'" id="d_height"/>'."\n";
       $height = $this->height;
     }
 
-    $result .= "<div id='d_scrollbody' style='width:100%;'>\n";
-    $result .= "<table style='width:100%;' id='t_scrolltable' class='listingTable'>\n";
-    $this->numColumns = count($this->colprops) + ($this->multiSelect?1:0);
+    $result .= '<div id="d_scrollbody" style="width:100%;">'."\n";
+    $result .= '<table style="width:100%;" id="t_scrolltable" class="listingTable">'."\n";
 
     // Build list header
-    $result .= "<thead><tr>\n";
+    $result .= '<thead><tr>'."\n";
     if ($this->multiSelect) {
-      $width = "24px";
-      if (preg_match('/Konqueror/i', $_SERVER['HTTP_USER_AGENT'])) {
-        $width = "28px";
-      }
-      $result .= "<th style='text-align:center;padding:0;width:$width;'><input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."' onClick='toggle_all_(\"listing_selected_[0-9]*$\",\"select_all\");' ></th>\n";
+      $width = '24px';
+      $result .= '<th style="text-align:center;padding:0;width:'.$width.';"><input type="checkbox" id="select_all" name="select_all" title="'._('Select all').'" onClick=\'toggle_all_("listing_selected_[0-9]*$","select_all");\' /></th>'."\n";
     }
     foreach ($this->header as $header) {
       $result .= $header;
     }
-    $result .= "</tr></thead>\n";
+    $result .= '</tr></thead>'."\n";
 
     // Build list body
-    $result .= "<tbody id='t_nscrollbody'>\n";
+    $result .= '<tbody id="t_nscrollbody">'."\n";
 
     // No results? Just take an empty colspanned row
     if (count($this->entries) + count($this->departments) == 0) {
-      $result .= "<tr><td class='list1nohighlight' colspan='$this->numColumns' style='height:100%;width:100%;'>&nbsp;</td></tr>";
+      $result .= '<tr><td colspan="'.($this->numColumns + ($this->multiSelect ? 1 : 0)).'" style="height:100%;width:100%;">&nbsp;</td></tr>'."\n";
     }
 
-    // Line color alternation
-    $alt  = 0;
-    $deps = 0;
-
     // Draw department browser if configured and we're not in sub mode
-    $this->useSpan = FALSE;
     if ($this->departmentBrowser && ($this->filter->scope != 'sub')) {
       // Fill with department browser if configured this way
       $departmentIterator = new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]);
@@ -404,27 +387,22 @@ class listing
         }
 
         // Render defined department columns, fill the rest with some stuff
-        $rest = $this->numColumns - 1;
+        $rest = $this->numColumns;
         foreach ($this->xmlData['table']['department'] as $index => $cfg) {
           $colspan = 1;
           if (isset($cfg['span'])) {
-            $colspan        = $cfg['span'];
-            $this->useSpan  = TRUE;
+            $colspan = $cfg['span'];
           }
           $result .= '<td colspan="'.$colspan.'" '.$this->colprops[$index].'>'.$this->renderCell('department', $index, $cfg['value'], $entry, $row).'</td>';
           $rest -= $colspan;
         }
 
         // Fill remaining cols with nothing
-        $last = $this->numColumns - $rest;
-        for ($i = 0; $i < $rest; $i++) {
-          $result .= '<td '.$this->colprops[$last + $i - 1].'>&nbsp;</td>';
+        for ($i = $this->numColumns - $rest; $i < $this->numColumns; $i++) {
+          $result .= '<td '.$this->colprops[$i].'>&nbsp;</td>';
         }
         $result .= '</tr>';
-
-        $alt++;
       }
-      $deps = $alt;
     }
 
     // Fill with contents, sort as configured
@@ -466,7 +444,6 @@ class listing
       }
 
       $result .= "</tr>\n";
-      $alt++;
     }
 
     // Close list body
@@ -494,7 +471,7 @@ class listing
     }
 
     // Close list
-    $result .= $switch?"<input type='hidden' id='list_workaround'>":"";
+    $result .= '';
 
     // Add scroll positioner
     $result .= '<script type="text/javascript">';
@@ -619,27 +596,27 @@ class listing
         }
       }
 
-      // Override base if we got signals from the navigation elements
-      $action = "";
-      foreach (array_keys($_POST) as $key) {
-        if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
-          $action = $match[1];
-          break;
+      if ($this->baseMode) {
+        // Override base if we got signals from the navigation elements
+        $action = '';
+        foreach (array_keys($_POST) as $key) {
+          if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
+            $action = $match[1];
+            break;
+          }
         }
-      }
 
-      // Navigation handling
-      if ($action == 'ROOT') {
-        $deps = $ui->get_module_departments($this->categories);
-        $this->setBase($deps[0]);
-        session::global_set("CurrentMainBase", $this->base);
-      }
-      if ($action == 'BACK') {
-        $base = preg_replace("/^[^,]+,/", "", $this->base);
-        $this->tryAndSetBase($base);
-      }
-      if ($action == 'HOME') {
-        $this->tryAndSetBase(get_base_from_people($ui->dn));
+        // Navigation handling
+        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);
+        } elseif ($action == 'HOME') {
+          $this->tryAndSetBase(get_base_from_people($ui->dn));
+        }
       }
     }
 
@@ -783,10 +760,6 @@ class listing
     // Watch out for filters and prepare to execute them
     $data = $this->processElementFilter($table, $index, $data, $cfg, $row);
 
-    // Replace all non replaced %{...} instances because they
-    // are non resolved attributes or filters
-    $data = preg_replace('/%{[^}]+}/', '&nbsp;', $data);
-
     return $data;
   }
 
@@ -806,15 +779,15 @@ class listing
     if (isset($this->filterCache[$type.$index])) {
       $filters = $this->filterCache[$type.$index];
     } else {
-      preg_match_all('/%{filter:([^(]+)\((.*)\)}/', $data, $matches, PREG_SET_ORDER);
+      preg_match_all('/%{filter:([^(]+)\((.*)\)}/', $data, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
 
       $filters = array();
       foreach ($matches as $match) {
         $cl     = '';
         $method = '';
-        if (!preg_match('/^(.*)::(.*)$/', $match[1], $m)) {
-          if (!isset($this->filters[$match[1]]) || !preg_match('/^(.*)::(.*)$/', $this->filters[$match[1]], $m)) {
-            trigger_error('Unknown filter '.$match[1]);
+        if (!preg_match('/^(.*)::(.*)$/', $match[1][0], $m)) {
+          if (!isset($this->filters[$match[1][0]]) || !preg_match('/^(.*)::(.*)$/', $this->filters[$match[1][0]], $m)) {
+            trigger_error('Unknown filter '.$match[1][0]);
             continue;
           }
         }
@@ -822,16 +795,16 @@ class listing
         $method = $m[2];
 
         // Prepare params for function call
-        preg_match_all('/"[^"]+"|[^,]+/', $match[2], $parts);
+        preg_match_all('/"[^"]+"|[^,]+/', $match[2][0], $parts);
 
-        $filters[$match[0]] = array($cl, $method, $parts[0]);
+        $filters[$match[0][0]] = array($cl, $method, $parts[0], $match[0][1]);
       }
 
       $this->filterCache[$type.$index] = $filters;
     }
 
     foreach ($filters as $filterstring => $filter) {
-      list ($cl, $method, $parts) = $filter;
+      list ($cl, $method, $parts, $offset) = $filter;
       $params = array();
       foreach ($parts as $param) {
         switch ($param) {
@@ -851,7 +824,7 @@ class listing
             $params[] = $this->getObjectType($cfg['dn'], $cfg);
             break;
           case 'dn':
-            $params[] = LDAP::fix($cfg['dn']);
+            $params[] = $cfg['dn'];
             break;
           default:
             if (preg_match('/^"(.*)"$/', $param, $m)) {
@@ -874,10 +847,10 @@ class listing
       // Replace information
       if ($cl == 'listing') {
         // Non static call
-        $data = preg_replace('/'.preg_quote($filterstring).'/', call_user_func_array(array($this, $method), $params), $data);
+        $data = substr_replace($data, call_user_func_array(array($this, $method), $params), $offset, strlen($filterstring));
       } else {
         // Static call
-        $data = preg_replace('/'.preg_quote($filterstring).'/', call_user_func_array(array($cl, $method), $params), $data);
+        $data = substr_replace($data, call_user_func_array(array($cl, $method), $params), $offset, strlen($filterstring));
       }
     }
 
@@ -978,7 +951,7 @@ class listing
     $result = "&nbsp;";
 
     if ($type) {
-      $result = '<img class="center" title="'.LDAP::fix($dn).'" src="'.htmlentities($types[$type]['image'], ENT_COMPAT, 'UTF-8').'" alt="'.$type.'"/>';
+      $result = '<img class="center" title="'.$dn.'" src="'.htmlentities($types[$type]['image'], ENT_COMPAT, 'UTF-8').'" alt="'.$type.'"/>';
       if (!isset($this->objectTypeCount[$types[$type]['label']])) {
         $this->objectTypeCount[$types[$type]['label']] = 0;
       }
@@ -1013,38 +986,44 @@ class listing
   {
     // Do nothing if there's no menu defined
     if (!isset($this->xmlData['actiontriggers']['action'])) {
-      return "&nbsp;";
+      return '&nbsp;';
     }
 
     // Go thru all actions
-    $result   = "";
-    foreach ($this->xmlData['actiontriggers']['action'] as &$action) {
+    $result   = '';
+    $emptyimg = '<img src="images/empty.png" alt=" " class="center optional"/>';
+    foreach ($this->xmlData['actiontriggers']['action'] as $action) {
       // 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;
         if (preg_match('/^!(.*)$/', $objectclass, $m)) {
           $objectclass = $m[1];
           if (in_array($objectclass, $classes)) {
-            $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
-            continue;
+            $skip = TRUE;
           }
         } elseif (is_string($objectclass)) {
           if (!in_array($objectclass, $classes)) {
-            $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
-            continue;
+            $skip = TRUE;
           }
         } elseif (is_array($objectclass)) {
           if (count(array_intersect($objectclass, $classes)) != count($objectclass)) {
-            $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
-            continue;
+            $skip = TRUE;
           }
         }
+        if ($skip) {
+          $result .= $emptyimg;
+          if ($action['type'] == 'snapshot') {
+            $result .= $emptyimg;
+          }
+          continue;
+        }
       }
 
       // Skip the entry completely if there's no permission to execute it
       if (!$this->hasActionPermission($action, $dn, $row)) {
-        $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
+        $result .= $emptyimg;
         continue;
       }
 
@@ -1054,12 +1033,12 @@ class listing
         if (preg_match('/^(.*)!$/', $fa, $m)) {
           $fa = $m[1];
           if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
-            $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
+            $result .= $emptyimg;
             continue;
           }
         } else {
           if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
-            $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
+            $result .= $emptyimg;
             continue;
           }
         }
@@ -1085,11 +1064,10 @@ class listing
           $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, $class);
+          $result .= $this->renderSnapshotActions($row, $this->entries[$row]['dn'], $category);
         }
       }
     }
-    unset($action);
 
     return $result;
   }
@@ -1134,18 +1112,26 @@ class listing
   {
     $row    = func_get_arg(0);
     $pid    = $this->pid;
-    $dn     = LDAP::fix(func_get_arg(1));
+    $dn     = func_get_arg(1);
     $params = array(func_get_arg(2));
 
     // Collect sprintf params
     for ($i = 3;$i < func_num_args();$i++) {
       $val = func_get_arg($i);
-      if (is_array($val)) {
-        $val = implode("<br/>\n", $val);
+      if (empty($val)) {
+        continue;
       }
-      if (!empty($val)) {
-        $params[] = htmlentities($val, ENT_COMPAT, 'UTF-8');
+      if (!is_array($val)) {
+        $val = array($val);
       }
+      $val = array_map(
+        function ($v)
+        {
+          return htmlentities($v, ENT_COMPAT, 'UTF-8');
+        },
+        $val
+      );
+      $params[] = implode("<br/>\n", $val);
     }
 
     $result = '&nbsp;';
@@ -1178,7 +1164,7 @@ class listing
     }
 
     /* Check if we are in users home  department */
-    if (!count($deps) || $this->filter->base == get_base_from_people($ui->dn) || !in_array_ics(get_base_from_people($ui->dn), $deps)) {
+    if (!count($deps) || ($this->filter->base == get_base_from_people($ui->dn)) || !in_array_ics(get_base_from_people($ui->dn), $deps)) {
       $enableHome = FALSE;
     }
 
@@ -1562,9 +1548,7 @@ class listing
     }
   }
 
-  /*!
-   * Get the depatments
-   */
+  /*! \brief Get the departments */
   function getDepartments()
   {
     $departments = array();
@@ -1576,38 +1560,44 @@ class listing
     // Load departments allowed by ACL
     $validDepartments = $ui->get_module_departments($this->categories);
 
-    // Build filter and look in the LDAP for possible sub departments
-    // of current base
-    $filter = "(|";
-    $attrs  = array("description", "objectClass");
+    /* Fetch departments andtheir informations */
     foreach ($types as $type) {
-      $i = objects::infos($type);
-      $filter .= $i['filter'];
-      // Specific key for departement objectTypes
-      $attrs[] = $i['mainAttr'];
-    }
-    $filter .= ")";
-    $res = get_list($filter, $this->categories, $this->base, $attrs, GL_NONE);
+      $i    = objects::infos($type);
+      $deps = objects::ls(
+        $type,
+        array(
+          'dn'            => 'raw',
+          'objectClass'   => 'raw',
+          'description'   => 'raw',
+          $i['mainAttr']  => 'raw'
+        ),
+        $this->base,
+        '',
+        FALSE,
+        'one'
+      );
 
-    // Analyze list of departments
-    foreach ($res as $department) {
-      if (!in_array($department['dn'], $validDepartments)) {
-        continue;
-      }
+      // Analyze list of departments
+      foreach ($deps as $department) {
+        if (!in_array($department['dn'], $validDepartments)) {
+          continue;
+        }
 
-      // Add the attribute where we use for sorting
-      $oc = NULL;
-      foreach ($types as $type) {
-        if (objects::isOfType($department, $type)) {
-          $oc = $type;
-          break;
+        /* php-ldap like indexes are needed for renderCell */
+        $count = 0;
+        foreach ($department as $key => $values) {
+          if ($key != 'dn') {
+            $department[$count++] = $key;
+          }
         }
-      }
-      $i = objects::infos($oc);
-      $department['sort-attribute'] = $i['mainAttr'];
+        $department['count'] = $count;
+
+        // Add the attribute where we use for sorting
+        $department['sort-attribute'] = $i['mainAttr'];
 
-      // Move to the result list
-      $departments[] = $department;
+        // Move to the result list
+        $departments[] = $department;
+      }
     }
 
     return $departments;
@@ -1654,7 +1644,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="paste" class="center">&nbsp;'._('Paste').'</a></li>';
       }
     }
 
@@ -1664,7 +1654,6 @@ class listing
 
   function renderCopyPasteActions($row, $dn, $category, $class, $copy = TRUE, $cut = TRUE)
   {
-
     // We can only provide information if we've got a copypaste handler
     // instance
     if (!is_object($this->copyPasteHandler)) {
@@ -1689,7 +1678,7 @@ class listing
 
     // Render copy entries
     if ($copy) {
-      if ($ui->is_copyable($dn, $category, $class)) {
+      if ($ui->is_copyable($dn, $category)) {
         $result .= '<input class="center" type="image"'.
                     ' src="geticon.php?context=actions&amp;icon=edit-copy&amp;size=16"'.
                     ' alt="'._('Copy').'" name="listing_copy_'.$row.'" title="'._('Copy this entry').'"'.
@@ -1715,15 +1704,8 @@ class listing
     $ui     = get_userinfo();
 
     if ($ui->allow_snapshot_restore($this->base, $this->categories)) {
-
-      // Check if there is something to restore
-      $restore = FALSE;
-      foreach ($this->snapshotHandler->getSnapshotBases() as $base) {
-        $restore = $restore || count($this->snapshotHandler->getDeletedSnapshots($base)) > 0;
-      }
-
       // Draw icons according to the restore flag
-      if ($restore) {
+      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>";
@@ -1754,7 +1736,7 @@ class listing
   }
 
 
-  function renderSnapshotActions($row, $dn, $category, $class, $copy = TRUE, $cut = TRUE)
+  function renderSnapshotActions($row, $dn, $category)
   {
     /* We can only provide information if we've got a snapshot handler instance */
     if (!is_object($this->snapshotHandler)) {
@@ -1762,28 +1744,33 @@ class listing
     }
 
     // Presets
-    $result = "";
+    $result = '';
     $ui = get_userinfo();
 
-    // Draw restore button
     if ($ui->allow_snapshot_restore($dn, $category)) {
-      // Do we have snapshots for this dn?
+      /* Draw restore button */
+
       if ($this->snapshotHandler->hasSnapshots($dn)) {
-        $result .= "<input class='center' type='image' src='geticon.php?context=actions&amp;icon=document-restore&amp;size=16' ".
-                   "alt='"._("Restore snapshot")."' name='listing_restore_$row' title='".
-                   _("Restore snapshot")."'>";
+        /* We have snapshots for this dn */
+        $result .= '<input class="center" type="image"'.
+                    ' src="geticon.php?context=actions&amp;icon=document-restore&amp;size=16"'.
+                    ' alt="'._('Restore snapshot').'" name="listing_restore_'.$row.'"'.
+                    ' title="'._('Restore snapshot').'"/>';
       } else {
-        $result .= "<img src='geticon.php?context=actions&amp;icon=document-restore&amp;size=16&amp;disabled=1' alt='restore' class='center'>";
+        $result .= '<img class="center"'.
+                    ' src="geticon.php?context=actions&amp;icon=document-restore&amp;size=16&amp;disabled=1"'.
+                    ' alt="restore"/>';
       }
     }
 
-    // Draw snapshot button
     if ($ui->allow_snapshot_create($dn, $category)) {
-      $result .= "<input class='center' type='image' src='geticon.php?context=actions&amp;icon=snapshot&amp;size=16' ".
-                 "alt='"._("Create snapshot")."' name='listing_snapshot_$row' title='".
-                 _("Create a new snapshot from this object")."'>";
+      /* Draw snapshot button */
+      $result .= '<input class="center" type="image"'.
+                  ' src="geticon.php?context=actions&amp;icon=snapshot&amp;size=16"'.
+                  ' alt="'._('Create snapshot').'" name="listing_snapshot_'.$row.'"'.
+                  ' title="'._('Create a new snapshot from this object').'"/>';
     } else {
-      $result .= "<img src='images/empty.png' alt=' ' class='center optional'>";
+      $result .= '<img src="images/empty.png" alt=" " class="center optional"/>';
     }
 
     return $result;
diff --git a/include/class_listingSortIterator.inc b/include/class_listingSortIterator.inc
index 441fd5eacfc74e69306f915af635028016915383..ab37ff1ab8a5b08aabd522ea01a689af264116de 100644
--- a/include/class_listingSortIterator.inc
+++ b/include/class_listingSortIterator.inc
@@ -29,7 +29,7 @@
  * go up, go down , back , next. etc...
  */
 class listingSortIterator implements Iterator {
-  private $data;
+  protected $data;
 
   /*!
    * \brief listingSortIterator constructor
@@ -42,58 +42,62 @@ class listingSortIterator implements Iterator {
    *
    * \param string $type
    */
-  public function __construct($data, $direction, $attribute, $type = "string")
+  public function __construct($data, $direction, $attribute, $type = 'string')
   {
-    global $_sortAttribute;
-    global $_sortType;
-    $_sortAttribute = $attribute;
-    $_sortType      = $type;
-
     // Sort for attribute
-    if ($attribute != "") {
+    if ($attribute != '') {
       uasort(
         $data,
-        function ($ao, $bo)
+        function ($ao, $bo) use ($attribute, $type)
         {
-          global $_sortAttribute;
-          global $_sortType;
+          if ($attribute == 'sort-attribute') {
+            // Override sort attribute from data if needed
+            $attribute_a = $ao['sort-attribute'];
+            $attribute_b = $bo['sort-attribute'];
+          } else {
+            $attribute_a = $attribute;
+            $attribute_b = $attribute;
+          }
 
           // Extract values from ao and bo
-          $a = $b = "";
-          if (isset($ao[$_sortAttribute])) {
-            $a = $ao[$_sortAttribute];
+          $a = $b = '';
+          if (isset($ao[$attribute_a])) {
+            $a = $ao[$attribute_a];
             if (is_array($a)) {
               $a = $a[0];
             }
           }
-          if (isset($bo[$_sortAttribute])) {
-            $b = $bo[$_sortAttribute];
+          if (isset($bo[$attribute_b])) {
+            $b = $bo[$attribute_b];
             if (is_array($b)) {
               $b = $b[0];
             }
           }
 
           // Take a look at the several types
-          switch ($_sortType) {
+          switch ($type) {
             // Sort for string by default
             default:
             case 'string':
               return strcoll($a, $b);
 
+            case 'department':
+              return strnatcmp($a, $b);
+
             case 'integer':
               return $b - $a;
 
             case 'date':
-              if ($a == "") {
-                $a = "31.12.0000";
+              if ($a == '') {
+                $a = '31.12.0000';
               }
-              if ($b == "") {
-                $b = "31.12.0000";
+              if ($b == '') {
+                $b = '31.12.0000';
               }
               list($d, $m, $y) = explode('.', $a);
-              $a = (int)sprintf("%04d%02d%02d", $y, $m, $d);
+              $a = (int)sprintf('%04d%02d%02d', $y, $m, $d);
               list($d, $m, $y) = explode('.', $b);
-              $b = (int)sprintf("%04d%02d%02d", $y, $m, $d);
+              $b = (int)sprintf('%04d%02d%02d', $y, $m, $d);
               return $b - $a;
 
             case 'ip':
diff --git a/include/class_logging.inc b/include/class_logging.inc
index fb6e0e8caa93bc4acaf1ae4cbda4c53b37476bd3..c84454d92c8e2c3ff110acd2853851ffff4c6d34 100644
--- a/include/class_logging.inc
+++ b/include/class_logging.inc
@@ -49,12 +49,13 @@ class logging {
    *
    * \param $result         A status message, containing errors or success messages
    */
-  static function log ($action, $objecttype, $object, $changes_array = array(), $result = '')
+  static function log ($action, $objecttype, $object, array $changes_array = array(), $result = '')
   {
     global $config, $ui;
-    if (!is_array($changes_array)) {
-      trigger_error('log(string,string,string,array(),bool). Forth parameter must be an array.');
-      $changes_array = array();
+
+    if ($result === NULL) {
+      trigger_error('"Result" parameter should not be NULL');
+      $result = '';
     }
 
     /* Create data object */
@@ -134,7 +135,7 @@ class logging {
   {
     global $config;
     if ($entry['objecttype'] == 'plugin/auditEvent') {
-      // Avoid infinite loop
+      /* Avoid infinite loop */
       return;
     }
     $tabObject = objects::create('auditEvent');
@@ -147,10 +148,8 @@ class logging {
     $baseObject->fdAuditAttributes  = $entry['changes'];
     $baseObject->fdAuditResult      = $entry['result'];
     $baseObject->base               = $config->current['BASE'];
-    $message = $tabObject->check();
-    if (count($message) == 0) {
-      $tabObject->save();
-    } else {
+    $message = $tabObject->save();
+    if (!empty($message)) {
       msg_dialog::displayChecks($message);
     }
   }
diff --git a/include/class_management.inc b/include/class_management.inc
deleted file mode 100644
index 7b384c8c987e84ba49572ce9caf34aed869867ff..0000000000000000000000000000000000000000
--- a/include/class_management.inc
+++ /dev/null
@@ -1,1027 +0,0 @@
-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  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_management.inc
- * Source code for the class management
- */
-
-/*!
- * \brief This class contains all the function needed to manage various
- * functions like new,save, edit, apply, cut/copy/paste , snapshot etc...
- */
-class management
-{
-  // The plugin description
-  public $plugname      = "unconfigured";
-  public $plIcon        = "unconfigured";
-  public $plDescription = "unconfigured";
-  public $plHeadline    = "unconfigured";
-
-  // The currently used object(s) (e.g. in edit, removal)
-  // this is public due to some compatibility problems with class plugin..
-  public $dn      = "";
-  protected $dns  = array();
-
-  // The last used object(s).
-  protected $last_dn  = "";
-  protected $last_dns = array();
-
-  // The common places the displayed objects are stored in. (e.g. array("ou=groups,",".."))
-  protected $storagePoints = array();
-
-  // The tab definitions to use for the current object.
-  // e.g. usertabs
-  protected $tabClass     = "";
-  // e.g. USERTABS
-  protected $tabType      = "";
-  // e.g. generic
-  protected $aclPlugin    = "";
-  // e.g. user
-  protected $aclCategory  = "";
-  // e.g. users
-  protected $objectName   = "";
-
-  // The opened object.
-  protected $tabObject    = NULL;
-  protected $dialogObject = NULL;
-
-  // The last opened object.
-  protected $last_tabObject     = NULL;
-  protected $last_dialogObject  = NULL;
-
-  // Whether to display the apply button or not
-  protected $displayApplyBtn = FALSE;
-
-  // Whether to display a header or not.
-  protected $skipHeader = FALSE;
-
-  // Whether to display a footer or not.
-  protected $skipFooter = FALSE;
-
-  protected $skipCpHandler    = FALSE;
-  protected $skipSnapHandler  = FALSE;
-
-  // Copy&Paste handler
-  protected $cpHandler = NULL;
-
-  // Indicates that we want to paste objects right now.
-  protected $cpPastingStarted = FALSE;
-
-  // The Snapshot handler class.
-  protected $snapHandler = NULL;
-
-  // The listing handlers
-  protected $headpage = NULL;
-  protected $filter   = NULL;
-
-  // A list of configured actions/events
-  protected $actions = array();
-
-  // Attributes managed by this plugin, can be used in post events;
-  public $attributes = array();
-
-  // Some management classes are used in tab groups and needs this set to FALSE.
-  var $is_template    = FALSE;
-
-  function  __construct($plugname, $headpage)
-  {
-    global $config;
-    $this->plugname = $plugname;
-    $this->headpage = $headpage;
-
-    // Add copy&paste and snapshot handler.
-    if (!$this->skipCpHandler) {
-      $this->cpHandler = new CopyPasteHandler();
-      $this->headpage->setCopyPasteHandler($this->cpHandler);
-    }
-    if (!$this->skipSnapHandler && ($config->get_cfg_value("enableSnapshots") == "TRUE")) {
-      $this->snapHandler = new SnapshotHandler();
-      $this->headpage->setSnapshotHandler($this->snapHandler);
-    }
-
-    // Register default actions
-    $this->registerAction("new",    "newEntry");
-    $this->registerAction("edit",   "editEntry");
-    $this->registerAction("apply",  "applyChanges");
-    $this->registerAction("save",   "saveChanges");
-
-    $this->registerAction("cancel",       "cancelEdit");
-    $this->registerAction("cancelDelete", "cancelEdit");
-
-    $this->registerAction("remove",           "removeEntryRequested");
-    $this->registerAction("removeConfirmed",  "removeEntryConfirmed");
-
-    $this->registerAction("copy",   "copyPasteHandler");
-    $this->registerAction("cut",    "copyPasteHandler");
-    $this->registerAction("paste",  "copyPasteHandler");
-
-    if ($config->get_cfg_value('enableSnapshots') == 'TRUE') {
-      $this->registerAction('snapshot', 'createSnapshotDialog');
-      $this->registerAction('restore',  'restoreSnapshotDialog');
-    }
-  }
-
-  /*!
-   * \brief  Execute this plugin
-   *          Handle actions/events, locking, snapshots, dialogs, tabs,...
-   */
-  function execute()
-  {
-    // Ensure that html posts and gets are kept even if we see a 'Entry islocked' dialog.
-    $vars = array('/^act$/','/^listing/','/^PID$/');
-    session::set('LOCK_VARS_TO_USE', $vars);
-
-    /* Display the copy & paste dialog, if it is currently open */
-    $ret = $this->copyPasteHandler("", array());
-    if ($ret) {
-      return $this->getHeader().$ret;
-    }
-
-    // Update filter
-    if ($this->filter) {
-      $this->filter->update();
-      session::global_set(get_class($this)."_filter", $this->filter);
-      session::set('autocomplete', $this->filter);
-      if (!$this->filter->isValid()) {
-        msg_dialog::display(_("Filter error"), _("The filter is incomplete!"), ERROR_DIALOG);
-      }
-    }
-
-    // Handle actions (POSTs and GETs)
-    $str = $this->handleActions($this->detectPostActions());
-    if ($str) {
-      return $this->getHeader().$str;
-    }
-
-    // Open single dialog objects
-    if (is_object($this->dialogObject)) {
-      if (method_exists($this->dialogObject, 'save_object')) {
-        $this->dialogObject->save_object();
-      }
-      if (method_exists($this->dialogObject, 'execute')) {
-        $display = $this->dialogObject->execute();
-        $display .= $this->_getTabFooter();
-        return $this->getHeader().$display;
-      }
-    }
-
-    // Display tab object.
-    if ($this->tabObject instanceOf simpleTabs) {
-      $this->tabObject->save_object();
-      $display = $this->tabObject->execute();
-      $display .= $this->_getTabFooter();
-      return $this->getHeader().$display;
-    }
-
-    // Set current restore base for snapshot handling.
-    if (is_object($this->snapHandler)) {
-      $bases = array();
-      foreach ($this->storagePoints as $sp) {
-        $bases[] = $sp.$this->headpage->getBase();
-      }
-
-      // No bases specified? Try base
-      if (!count($bases)) {
-        $bases[] = $this->headpage->getBase();
-      }
-      $this->snapHandler->setSnapshotBases($bases);
-    }
-
-    // Display list
-    return $this->renderList();
-  }
-
-  function renderList()
-  {
-    $this->headpage->update();
-    $display = $this->headpage->render();
-    return $this->getHeader().$display;
-  }
-
-  function getHeadpage()
-  {
-    return $this->headpage;
-  }
-
-  function getFilter()
-  {
-    return $this->filter;
-  }
-
-  /*!
-   * \brief  Generates the plugin header which is displayed whenever a tab object is
-   *           opened.
-   */
-  protected function getHeader()
-  {
-    if ($this->skipHeader) {
-      return "";
-    }
-
-    if (in_array_ics('plInfo', get_class_methods(get_class($this)))) {
-      $plInfos  = pluglist::pluginInfos(get_class($this));
-      $plTitle  = $plInfos['plTitle'];
-      $plIcon   = $plInfos['plIcon'];
-    } else {
-      $plTitle  = $this->plDescription;
-      $plIcon   = $this->plIcon;
-    }
-
-    if (!preg_match('/^geticon/', $plIcon)) {
-      $plIcon = get_template_path($plIcon);
-    }
-    if (get_object_info() != '') {
-      $display = print_header($plIcon, _($plTitle), LDAP::fix(get_object_info()));
-    } else {
-      $display = print_header($plIcon, _($plTitle));
-    }
-    return $display;
-  }
-
-
-  /*!
-   * \brief  Generates the footer which is used whenever a tab object is
-   *           displayed.
-   */
-  protected function _getTabFooter()
-  {
-    // Do not display tab footer for non tab objects
-    if (!($this->tabObject instanceOf simpleTabs)) {
-      return "";
-    }
-
-    // Check if there is a dialog opened - We don't need any buttons in this case.
-    if ($this->tabObject->dialogOpened()) {
-      return '';
-    }
-
-    // Skip footer if requested;
-    if ($this->skipFooter) {
-      return "";
-    }
-
-    // In case an of locked entry, we may have opened a read-only tab.
-    $str = "";
-    if (isset($this->tabObject->read_only) && ($this->tabObject->read_only == TRUE)) {
-      $str .= '<p class="plugbottom">'."\n".
-        '<input type="submit" name="edit_cancel" value="'.msgPool::cancelButton().'">'."\n".
-        '</p>';
-      return $str;
-    } else {
-      // Display ok, (apply) and cancel buttons
-      $str .= '<p class="plugbottom">'."\n";
-      $str .= '<input type="submit" name="edit_finish" style="width:80px" value="'.msgPool::okButton().'"/>'."\n";
-      $str .= "&nbsp;\n";
-      if ($this->displayApplyBtn) {
-        $str .= '<input type="submit" name="edit_apply" value="'.msgPool::applyButton().'"/>'."\n";
-        $str .= "&nbsp;\n";
-      }
-      $str .= '<input type="submit" name="edit_cancel" value="'.msgPool::cancelButton().'"/>'."\n";
-      $str .= '</p>';
-    }
-    return $str;
-  }
-
-
-  /*!
-   * \brief  Initiates the removal for the given entries
-   *           and displays a confirmation dialog.
-   *
-   * \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'.
-   */
-  protected function removeEntryRequested($action = "", $target = array(), $all = array())
-  {
-    global $ui;
-    $disallowed = array();
-    $this->dns = array();
-
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removel requested!");
-
-    // Check permissons for each target
-    foreach ($target as $dn) {
-      $acl = $ui->get_permissions($dn, $this->aclCategory."/".$this->aclPlugin);
-      if (preg_match("/d/", $acl)) {
-        $this->dns[] = $dn;
-      } else {
-        $disallowed[] = $dn;
-      }
-    }
-    if (count($disallowed)) {
-      msg_dialog::display(_("Permission"), msgPool::permDelete($disallowed), INFO_DIALOG);
-    }
-
-    // We've at least one entry to delete.
-    if (count($this->dns)) {
-
-      // check locks
-      if ($locks = get_locks($this->dns)) {
-        return gen_locked_message($locks, $this->dns);
-      }
-
-      // Add locks
-      $dns_names = array();
-      foreach ($this->dns as $dn) {
-        $dns_names[] = LDAP::fix($dn);
-      }
-      add_lock ($this->dns, $ui->dn);
-
-      // Display confirmation dialog.
-      $smarty = get_smarty();
-      $smarty->assign("info", msgPool::deleteInfo($dns_names, _($this->objectName)));
-      $smarty->assign("multiple", TRUE);
-      return $smarty->fetch(get_template_path('remove.tpl', TRUE));
-    }
-  }
-
-
-  /*!
-   * \brief  Object removal was confirmed, now remove the requested entries.
-   *
-   * \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 $altTabClass Empty string.
-   *
-   * \param String $altTabType Empty string.
-   *
-   * \param String $altAclCategory Empty string.
-   */
-  function removeEntryConfirmed($action = "", $target = array(), $all = array(),
-      $altTabClass = "", $altTabType = "", $altAclCategory = "")
-  {
-    global $ui;
-    $tabType      = $this->tabType;
-    $tabClass     = $this->tabClass;
-    $aclCategory  = $this->aclCategory;
-
-    if (!empty($altTabClass)) {
-      $tabClass = $altTabClass;
-    }
-    if (!empty($altTabType)) {
-      $tabType = $altTabType;
-    }
-    if (!empty($altAclCategory)) {
-      $aclCategory = $altAclCategory;
-    }
-
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal confirmed!");
-
-    foreach ($this->dns as $dn) {
-      // Check permissions, are we allowed to remove this object?
-      $acl = $ui->get_permissions($dn, $aclCategory."/".$this->aclPlugin);
-      if (preg_match("/d/", $acl)) {
-
-        // Delete the object
-        $this->dn = $dn;
-        $this->openTabObject(
-          new $tabClass(NULL, $config->data['TABS'][$tabType], $this->dn, $aclCategory),
-          $this->dn
-        );
-        $this->tabObject->delete ();
-
-        // Remove the lock for the current object.
-        del_lock($this->dn);
-      } else {
-        msg_dialog::display(_('Permission error'), msgPool::permDelete(), ERROR_DIALOG);
-        logging::log('security', 'group/'.get_class($this), $dn, array(), 'Tried to trick deletion.');
-      }
-    }
-
-    // Cleanup
-    $this->remove_lock();
-    $this->closeDialogs();
-  }
-
-
-  /*!
-   * \brief  Detects actions/events send by the ui
-   *           and the corresponding targets.
-   */
-  function detectPostActions()
-  {
-    if (!is_object($this->headpage)) {
-      trigger_error("No valid headpage given....!");
-      return array();
-    }
-    $action = $this->headpage->getAction();
-    if (isset($_POST['edit_apply'])) {
-      $action['action'] = 'apply';
-    }
-    if (isset($_POST['edit_finish'])) {
-      $action['action'] = 'save';
-    }
-    if (isset($_POST['edit_cancel'])) {
-      $action['action'] = 'cancel';
-    }
-    if (!$this->is_modal_dialog()) {
-      if (isset($_POST['delete_confirmed'])) {
-        $action['action'] = 'removeConfirmed';
-      }
-      if (isset($_POST['delete_cancel'])) {
-        $action['action'] = 'cancelDelete';
-      }
-    }
-
-    return $action;
-  }
-
-
-  /*!
-   *  \brief  Calls the registered method for a given action/event.
-   */
-  function handleActions($action)
-  {
-    // Start action
-    if (isset($this->actions[$action['action']])) {
-      $func = $this->actions[$action['action']];
-      if (!isset($action['targets'])) {
-        $action['targets'] = array();
-      }
-      return $this->$func($action['action'], $action['targets'], $action);
-    }
-  }
-
-  /*!
-   * \brief  Opens the snapshot creation dialog for the given 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 createSnapshotDialog($action = '', $target = array(), $all = array())
-  {
-    global $ui;
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, 'Snaptshot creation initiated!');
-
-    if (count($target) == 1) {
-      $this->dn = array_pop($target);
-      if (empty($this->dn)) {
-        return;
-      }
-      $aclCategory = $this->aclCategory;
-      if ($ui->allow_snapshot_create($this->dn, $aclCategory)) {
-        $this->dialogObject = new SnapshotCreateDialog($this->dn, $this, $aclCategory);
-        $this->dialogObject->set_acl_base($this->dn);
-      } else {
-        msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to create a snapshot for %s.'), $this->dn),
-            ERROR_DIALOG);
-      }
-    }
-  }
-
-  /*!
-   * \brief  Creates a new snapshot entry
-   */
-  function createSnapshot($dn, $description)
-  {
-    global $ui;
-    if ($this->dn !== $dn) {
-      trigger_error('There was a problem with the snapshot workflow');
-      return;
-    }
-    if (!empty($dn) && $ui->allow_snapshot_create($dn, $this->dialogObject->aclCategory)) {
-      $this->snapHandler->createSnapshot($dn, $description);
-      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot created!');
-    } else {
-      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $dn),
-          ERROR_DIALOG);
-    }
-  }
-
-  /*!
-   * \brief  Restores a snapshot object.
-   *
-   * \param  String  $dn  The DN of the snapshot
-   */
-  function restoreSnapshot($dn)
-  {
-    global $ui;
-    if (!empty($dn) && $ui->allow_snapshot_restore($dn, $this->dialogObject->aclCategory)) {
-      $this->snapHandler->restoreSnapshot($dn);
-      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot restored');
-      $this->closeDialogs();
-    } else {
-      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $dn),
-          ERROR_DIALOG);
-    }
-  }
-
-
-  /*!
-   * \brief  Displays the "Restore snapshot dialog" for a given target.
-   *          If no target is specified, open the restore removed object
-   *           dialog.
-   * \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 = '', $target = array(), $all = array())
-  {
-    global $ui;
-
-    // Set current restore base for snapshot handling.
-    if (is_object($this->snapHandler)) {
-      $bases = array();
-      foreach ($this->storagePoints as $sp) {
-        $bases[] = $sp.$this->headpage->getBase();
-      }
-    }
-
-    // No bases specified? Try base
-    if (!count($bases)) {
-      $bases[] = $this->headpage->getBase();
-    }
-    if (!count($target)) {
-      // No target, open the restore removed object dialog.
-      $this->dn = $this->headpage->getBase();
-    } else {
-      // Display the restore points for a given object.
-      $this->dn = $target[0];
-    }
-    if (empty($this->dn)) {
-      return;
-    }
-
-    $aclCategory = $this->aclCategory;
-    if ($ui->allow_snapshot_restore($this->dn, $aclCategory)) {
-      @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);
-      $this->dialogObject->set_acl_base($this->dn);
-    } else {
-      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $this->dn),
-          ERROR_DIALOG);
-    }
-  }
-
-  /*!
-   * \brief Get all deleted snapshots
-   *
-   * \param string $base The base
-   *
-   * \param string boolean $raw
-   */
-  function getAllDeletedSnapshots($raw = FALSE)
-  {
-    $tmp = array();
-    $snapshotBases = $this->snapHandler->getSnapshotBases();
-    if (is_array($snapshotBases)) {
-      foreach ($snapshotBases as $base) {
-        $tmp = array_merge($tmp, $this->snapHandler->getAllDeletedSnapshots($base, $raw));
-      }
-    } else {
-      $tmp = $this->snapHandler->getAllDeletedSnapshots($snapshotBases, $raw);
-    }
-    return $tmp;
-  }
-
-  /*
-   * \brief Return available snapshots for the given base
-   *
-   * \param string $dn The DN
-   *
-   * \param string boolean $raw
-   */
-  function getAvailableSnapsShots($dn, $raw = FALSE)
-  {
-    return $this->snapHandler->getAvailableSnapsShots($dn, $raw);
-  }
-
-  /*!
-   * \brief Delete a snapshot
-   *
-   * \param string $dn DN of the snapshot
-   */
-  function removeSnapshot($dn)
-  {
-    $this->snapHandler->removeSnapshot($dn);
-  }
-
-  /*!
-   * \brief  This method intiates the object creation.
-   *
-   * \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 $altTabClass Empty string.
-   *
-   * \param String $altTabType Empty string.
-   *
-   * \param String $altAclCategory Empty string.
-   */
-  function newEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
-  {
-    global $config;
-    /* To handle mutliple object types overload this method.
-     * ...
-     *   registerAction('newUser', 'newEntry');
-     *   registerAction('newGroup','newEntry');
-     * ...
-     *
-     * function newEntry($action = "", $target= array(), $all=array(), $altTabClass ="", $altTabType = "", $altAclCategory)
-     * {
-     *   switch($action) {
-     *     case 'newUser' : {
-     *       mangement::newEntry($action,$target,$all,"usertabs","USERTABS","user");
-     *     }
-     *     case 'newGroup' : {
-     *       mangement::newEntry($action,$target,$all,"grouptabs","GROUPTABS","group");
-     *     }
-     *   }
-     * }
-     **/
-    $tabType      = $this->tabType;
-    $tabClass     = $this->tabClass;
-    $aclCategory  = $this->aclCategory;
-    if (!empty($altTabClass)) {
-      $tabClass = $altTabClass;
-    }
-    if (!empty($altTabType)) {
-      $tabType = $altTabType;
-    }
-    if (!empty($altAclCategory)) {
-      $aclCategory = $altAclCategory;
-    }
-
-    // Check locking & lock entry if required
-    $this->displayApplyBtn  = FALSE;
-    $this->dn               = "new";
-    $this->is_single_edit   = FALSE;
-
-    set_object_info($this->dn);
-
-    // Open object.
-    if (empty($tabClass) || empty($tabType)) {
-      // No tab type defined
-    } else {
-      if (isset($config->data['TABS'][$tabType])) {
-        $this->openTabObject(
-          new $tabClass(NULL, $config->data['TABS'][$tabType], $this->dn, $aclCategory),
-          $this->headpage->getBase()
-        );
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Create new entry initiated!");
-      } else {
-        msg_dialog::display(_("Error"), sprintf(_("No tab declaration for '%s' found in your configuration file. Cannot create plugin instance!"), $tabType), ERROR_DIALOG);
-      }
-    }
-  }
-
-
-  /*!
-   * \brief  This method opens an existing object or a list of existing objects to be edited.
-   *
-   * \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 $altTabClass Empty string.
-   *
-   * \param String $altTabType Empty string.
-   *
-   * \param String $altAclCategory Empty string.
-   */
-  function editEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
-  {
-    global $config, $ui;
-    /* To handle mutliple object types overload this method.
-     * ...
-     *   registerAction('editUser', 'editEntry');
-     *   registerAction('editGroup','editEntry');
-     * ...
-     *
-     * function editEntry($action = "", $target= array(), $all=array(), $altTabClass ="", $altTabType = "", $altAclCategory)
-     * {
-     *   switch($action) {
-     *     case 'editUser' : {
-     *       mangement::editEntry($action,$target,$all,"usertabs","USERTABS","user");
-     *     }
-     *     case 'editGroup' : {
-     *       mangement::editEntry($action,$target,$all,"grouptabs","GROUPTABS","group");
-     *     }
-     *   }
-     * }
-     **/
-
-    // Do not create a new tabObject while there is already one opened,
-    //  the user may have just pressed F5 to reload the page.
-    if (is_object($this->tabObject)) {
-      return;
-    }
-
-    $tabType      = $this->tabType;
-    $tabClass     = $this->tabClass;
-    $aclCategory  = $this->aclCategory;
-    if (!empty($altTabClass)) {
-      $tabClass = $altTabClass;
-    }
-    if (!empty($altTabType)) {
-      $tabType = $altTabType;
-    }
-    if (!empty($altAclCategory)) {
-      $aclCategory = $altAclCategory;
-    }
-
-    $this->displayApplyBtn = count($target) == 1;
-
-    // Single edit - we only got one object dn.
-    if (count($target) == 1) {
-      $this->is_single_edit = TRUE;
-
-      // Get the dn of the object and creates lock
-      $this->dn = array_pop($target);
-      set_object_info($this->dn);
-      if ($locks = get_locks($this->dn)) {
-        return gen_locked_message($locks, $this->dn, TRUE);
-      }
-      add_lock ($this->dn, $ui->dn);
-
-      // Open object.
-      if (empty($tabClass) || empty($tabType)) {
-        trigger_error("We can't edit any object(s). 'tabClass' or 'tabType' is empty!");
-      } else {
-        $tab = $tabClass;
-        $this->openTabObject(
-          new $tab(NULL, $config->data['TABS'][$tabType], $this->dn, $aclCategory),
-          $this->dn
-        );
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Edit entry initiated!");
-      }
-    }
-  }
-
-
-  /*!
-   * \brief  Save object modifications and closes dialogs (returns to object listing).
-   *          - Calls 'tab::check' to validate the given input.
-   *          - Calls 'tab::save' to save back object modifications (e.g. to ldap).
-   *          - Calls 'management::remove_locks' to remove eventually created locks.
-   *          - Calls 'management::closeDialogs' to return to the object listing.
-   */
-  protected function saveChanges()
-  {
-    if ($this->tabObject instanceOf simpleTabs) {
-      $this->tabObject->save_object();
-      $msgs = $this->tabObject->check();
-      if (count($msgs)) {
-        msg_dialog::displayChecks($msgs);
-        return;
-      } else {
-        $this->tabObject->save();
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
-        $this->remove_lock();
-        $this->closeDialogs();
-      }
-    } elseif ($this->dialogObject instanceOf plugin) {
-      $this->dialogObject->save_object();
-      $msgs = $this->dialogObject->check();
-      if (count($msgs)) {
-        msg_dialog::displayChecks($msgs);
-        return;
-      } else {
-        $this->dialogObject->save();
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
-        $this->remove_lock();
-        $this->closeDialogs();
-      }
-    }
-  }
-
-
-  /*!
-   *  \brief  Save object modifications and keep dialogs opened.
-   *          - Calls 'ldap::check' to validate the given input.
-   *          - Calls 'ldap::save' to save back object modifications (e.g. to ldap).
-   */
-  protected function applyChanges()
-  {
-    if ($this->tabObject instanceOf simpleTabs) {
-      $this->tabObject->save_object();
-      $msgs = $this->tabObject->check();
-      if (count($msgs)) {
-        msg_dialog::displayChecks($msgs);
-        return "";
-      } else {
-        $this->tabObject->save();
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, "Modifications applied!");
-        $this->tabObject->re_init();
-      }
-    }
-  }
-
-
-  /*!
-   * \brief  This method closes dialogs
-   *          and cleans up the cached object info and the ui.
-   */
-  public function closeDialogs()
-  {
-    $this->last_dn  = $this->dn;
-    $this->dn       = "";
-    $this->last_dns = $this->dns;
-    $this->dns      = array();
-
-    $this->last_tabObject     = $this->tabObject;
-    $this->tabObject          = NULL;
-    $this->last_dialogObject  = $this->dialogObject;
-    $this->dialogObject       = NULL;
-
-    $this->skipFooter   = FALSE;
-    set_object_info();
-  }
-
-
-  /*!
-   * \brief  Editing an object was caneled.
-   *          Close dialogs/tabs and remove locks.
-   */
-  protected function cancelEdit()
-  {
-    $this->remove_lock();
-    $this->closeDialogs();
-  }
-
-
-  /*!
-   *  \brief  Every click in the list user interface sends an event
-   *          here can we connect those events to a method.
-   *          eg. see management::registerEvent('new','createUser')
-   *          When the action/event new is send, the method 'createUser'
-   *          will be called.
-   */
-  function registerAction($action, $target)
-  {
-    $this->actions[$action] = $target;
-  }
-
-
-  /*!
-   * \brief  Removes ldap object locks created by this class.
-   *         Whenever an object is edited, we create locks to avoid
-   *         concurrent modifications.
-   *         This locks will automatically removed here.
-   */
-  function remove_lock()
-  {
-    if (!empty($this->dn) && $this->dn != "new") {
-      del_lock($this->dn);
-    }
-    if (count($this->dns)) {
-      del_lock($this->dns);
-    }
-  }
-
-
-  /*!
-   * \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 $altTabClass Empty string.
-   *
-   * \param $altTabType Empty string.
-   *
-   * \param $altAclCategory Empty string.
-   *
-   * \param $altAclPlugin Empty string.
-   */
-  function copyPasteHandler($action = "", $target = array(), $all = array(),
-      $altTabClass = "", $altTabType = "", $altAclCategory = "", $altAclPlugin = "")
-  {
-    global $ui;
-
-    // Return without any actions while copy&paste handler is disabled.
-    if (!is_object($this->cpHandler)) {
-      return FALSE;
-    }
-
-    $tabType      = $this->tabType;
-    $tabClass     = $this->tabClass;
-    $aclCategory  = $this->aclCategory;
-    $aclPlugin    = $this->aclPlugin;
-    if (!empty($altTabClass) && !is_array($altTabClass)) {
-      $tabClass = $altTabClass;
-    }
-    if (!empty($altTabType) && !is_array($altTabType)) {
-      $tabType = $altTabType;
-    }
-    if (!empty($altAclCategory) && !is_array($altAclCategory)) {
-      $aclCategory = $altAclCategory;
-    }
-    if (!empty($altAclPlugin) && !is_array($altAclPlugin)) {
-      $aclPlugin = $altAclPlugin;
-    }
-
-    // Save user input
-    $this->cpHandler->save_object();
-
-    // Add entries to queue
-    if ($action == "copy" || $action == "cut") {
-      $this->cpHandler->cleanup_queue();
-      foreach ($target as $dn) {
-        if (is_array($altTabClass)) {
-          $tabClass = (empty($altTabClass[$dn])?$this->tabClass:$altTabClass[$dn]);
-        }
-        if (is_array($altTabType)) {
-          $tabType = $altTabType[$dn];
-        }
-        if (is_array($altAclCategory)) {
-          $aclCategory = (empty($altAclCategory[$dn])?$this->aclCategory:$altAclCategory[$dn]);
-        }
-        if (is_array($altAclPlugin)) {
-          $aclPlugin = $altAclPlugin[$dn];
-        }
-
-        if ($action == "copy" && $ui->is_copyable($dn, $aclCategory, $aclPlugin)) {
-          $this->cpHandler->add_to_queue($dn, "copy", $tabClass, $tabType, $aclCategory);
-          @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, "Entry copied!");
-        }
-        if ($action == "cut" && $ui->is_cutable($dn, $aclCategory, $aclPlugin)) {
-          $this->cpHandler->add_to_queue($dn, "cut", $tabClass, $tabType, $aclCategory);
-          @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, "Entry cutted!");
-        }
-      }
-    }
-
-    // Initiate pasting
-    if ($action == "paste") {
-      $this->cpPastingStarted = TRUE;
-    }
-
-    // Display any c&p dialogs, eg. object modifications required before pasting.
-    if ($this->cpPastingStarted && $this->cpHandler->entries_queued()) {
-      $data = $this->cpHandler->execute($this->headpage->getBase());
-      if (!empty($data)) {
-        return $data;
-      }
-    }
-
-    // Automatically disable pasting process since there is no entry left to paste.
-    if (!$this->cpHandler->entries_queued()) {
-      $this->cpPastingStarted = FALSE;
-    }
-    return "";
-  }
-
-  /*!
-   * \brief Set a new filter
-   *
-   * \param object $filter The new filter
-   */
-  function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-
-  function is_modal_dialog()
-  {
-    return (is_object($this->tabObject) || is_object($this->dialogObject));
-  }
-
-  function openTabObject($object, $base)
-  {
-    $this->tabObject = $object;
-    $this->tabObject->set_acl_base($base);
-    $this->tabObject->parent = &$this;
-  }
-}
-?>
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index b2ebc176e5cd611edfdb9a494ff989eac62bc83a..1150be00615cb2dc56d6b851b1d18e2c0c57e04d 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -453,7 +453,7 @@ class msgPool {
       }
 
       return sprintf(_("The field '%s' contains invalid characters"), $name).". ".
-        (strlen($mismatch) == 1?sprintf(_("'%s' is not allowed:"), $mismatch):sprintf(_("'%s' are not allowed!"), $mismatch)).
+        ((strlen($mismatch) == 1) ? sprintf(_("'%s' is not allowed:"), $mismatch) : sprintf(_("'%s' are not allowed!"), $mismatch)).
         "<br><br> \"$result\"$example";
     } else {
       return sprintf(_("The field '%s' contains invalid characters"), $name)."!$example";
@@ -507,9 +507,9 @@ class msgPool {
    *
    * \param string $what Text for the button
    */
-  public static function addButton($what = "")
+  public static function addButton($what = '')
   {
-    return ($what == "" ? sprintf(_("Add")): sprintf(_("Add %s"), $what));
+    return (($what == '') ? sprintf(_('Add')) : sprintf(_('Add %s'), $what));
   }
 
   /*!
@@ -517,9 +517,9 @@ class msgPool {
    *
    * \param string $what Text for the button
    */
-  public static function delButton($what = "")
+  public static function delButton($what = '')
   {
-    return ($what == "" ? sprintf(_("Delete")): sprintf(_("Delete %s"), $what));
+    return (($what == '') ? sprintf(_('Delete')) : sprintf(_('Delete %s'), $what));
   }
 
   /*!
@@ -527,17 +527,17 @@ class msgPool {
    *
    * \param string $what Text for the button
    */
-  public static function editButton($what = "")
+  public static function editButton($what = '')
   {
-    return ($what == "" ? sprintf(_("Edit...")): sprintf(_("Edit %s..."), $what));
+    return (($what == '') ? sprintf(_('Edit...')) : sprintf(_('Edit %s...'), $what));
   }
 
   /*!
    * \brief Text for a back button
    */
-  public static function backButton($what = "")
+  public static function backButton()
   {
-    return _("Back");
+    return _('Back');
   }
 
   /*!
@@ -604,24 +604,14 @@ class msgPool {
    *
    * \param array $depends Contains all the settings disabled
    */
-  public static function featuresDisabled($name, $depends = "")
+  public static function featuresDisabled($name, array $depends = array(), array $conflicts = array())
   {
-    if (($depends == "") || (is_array($depends) && count($depends) == 0)) {
-      return sprintf(_("This account has %s settings disabled. You can enable them by clicking below."), $name);
+    if (empty($depends) && empty($conflicts)) {
+      return sprintf(_('This account has %s settings disabled. You can enable them by clicking below.'), $name);
+    } elseif (!empty($depends)) {
+      return sprintf(_('This account has %s settings disabled. To enable them, you\'ll need to add the %s settings first!'), $name, implode(' / ', $depends));
     } else {
-      if (count($depends) == 1) {
-        if (is_array($depends)) {
-          $depends = $depends[0];
-        }
-        return sprintf(_("This account has %s settings disabled. To enable them, you'll need to add 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 disabled. To enable them, you'll need to add the %s settings first!"), $name, $deps);
-      }
+      return sprintf(_('This account has %s settings disabled. To enable them, you\'ll need to disable the %s settings first!'), $name, implode(' / ', $conflicts));
     }
   }
 
@@ -673,20 +663,6 @@ class msgPool {
     return array( _("Sunday"), _("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"));
   }
 
-  /*!
-   * \brief Display error about database
-   *
-   * \param string $error Error to display
-   *
-   * \param string $plugin
-   */
-  public static function dbError($error, $plugin = "")
-  {
-    /* Assign headline depending on type */
-    $headline = _("Database operation failed!");
-    return $headline."<br><br><i>"._("Error").":</i> ".$error;
-  }
-
   /*!
    * \brief Display LDAP error
    *
@@ -698,24 +674,26 @@ class msgPool {
    *
    * \param string $plugin
    */
-  public static function ldaperror($error, $dn = "", $type = 0, $plugin = "")
+  public static function ldaperror($error, $dn = '', $type = 0, $plugin = '')
   {
     /* Assign headline depending on type */
-    $typemap = array(1 => _("read operation"), _("add operation"), _("modify operation"),
-        _("delete operation"), _("search operation"), _("authentication"));
+    $typemap = array(1 => _('read operation'), _('add operation'), _('modify operation'),
+        _('delete operation'), _('search operation'), _('authentication'));
 
     if (isset($typemap[$type])) {
-      $headline = sprintf(_("LDAP %s failed!"), $typemap[$type]);
+      $msg = sprintf(_('LDAP %s failed!'), $typemap[$type]);
     } else {
-      $headline = _("LDAP operation failed!");
+      $msg = _('LDAP operation failed!');
     }
 
     /* Fill DN information */
-    if ($dn != "") {
-      $dn_info = "<br><br><i>"._("Object").":</i> ".LDAP::fix($dn);
+    if ($dn != '') {
+      $msg .= '<br/><br/><i>'._('Object').':</i> '.$dn;
     }
 
-    return $headline.$dn_info."<br><br><i>"._("Error").":</i> ".$error;
+    $msg .= '<br/><br/><i>'._('Error').':</i> '.$error;
+
+    return $msg;
   }
 
   /*!
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index 870d5581347b6c069dd352fb9c3eb032162642fc..911606ffb10a2110be7d4b50f481a3a69c21f6e0 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -23,12 +23,13 @@
  * Source code for class message dialog
  */
 
-define("INFO_DIALOG",         10001);
-define("WARNING_DIALOG",      10002);
-define("ERROR_DIALOG",        10003);
-define("LDAP_ERROR",          10003);
-define("CONFIRM_DIALOG",      10004);
-define("FATAL_ERROR_DIALOG",  10006);
+define('INFO_DIALOG',         10001);
+define('WARNING_DIALOG',      10002);
+define('ERROR_DIALOG',        10003);
+// LDAP_ERROR is the same as ERROR_DIALOG
+define('LDAP_ERROR',          10003);
+define('CONFIRM_DIALOG',      10004);
+define('FATAL_ERROR_DIALOG',  10006);
 
 /*!
  * \brief This class contains all the function needed to make messages
@@ -36,13 +37,12 @@ define("FATAL_ERROR_DIALOG",  10006);
  */
 class msg_dialog
 {
-  private $s_Title    = "Undefined";
-  private $s_Message  = "Undefined";
+  private $s_Title    = 'Undefined';
+  private $s_Message  = 'Undefined';
   private $i_Type     = INFO_DIALOG;
   private $i_ID       = 0;
   private $a_Trace    = array();
 
-
   /*!
    * \brief Message dialog constructor
    *
@@ -53,54 +53,61 @@ class msg_dialog
    * \param string $i_type The type of the message dialog, by default = INFO_DIALOG
    */
   public function __construct($s_title, $s_message, $i_type)
+  {
+    if (!in_array($i_type, array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG))) {
+      trigger_error('Invalid msg_dialog type.');
+      $i_type = INFO_DIALOG;
+    }
+
+    $this->i_ID       = preg_replace('/[^0-9]*/', '', microtime());
+    $this->s_Title    = $s_title;
+    $this->s_Message  = $s_message;
+    $this->i_Type     = $i_type;
+  }
+
+  protected function show()
   {
     global $config;
 
-    if (empty($s_message)) {
+    if (empty($this->s_Message)) {
       return;
     }
 
-    if (!in_array($i_type, array(INFO_DIALOG,WARNING_DIALOG,ERROR_DIALOG,CONFIRM_DIALOG,FATAL_ERROR_DIALOG))) {
-      trigger_error("Invalid msg_dialog type.");
-      $i_type = INFO_DIALOG;
-    }
-
     if ((!session::is_set('errorsAlreadyPosted')) || !is_array(session::get('errorsAlreadyPosted'))) {
       session::set('errorsAlreadyPosted', array());
     }
 
     $errorsAlreadyPosted = session::get('errorsAlreadyPosted');
-    if (!isset($errorsAlreadyPosted[$s_title.$s_message])) {
-      $errorsAlreadyPosted[$s_title.$s_message] = 0;
+    if (!isset($errorsAlreadyPosted[$this->s_Title.$this->s_Message])) {
+      $errorsAlreadyPosted[$this->s_Title.$this->s_Message] = 0;
     }
-    $errorsAlreadyPosted[$s_title.$s_message]++;
+    $errorsAlreadyPosted[$this->s_Title.$this->s_Message]++;
 
-    if ($errorsAlreadyPosted[$s_title.$s_message] <= 1) {
+    session::set('errorsAlreadyPosted', $errorsAlreadyPosted);
 
-      $this->i_ID       = preg_replace("/[^0-9]*/", "", microtime());
-      $this->s_Title    = $s_title;
-      $this->s_Message  = $s_message;
-      $this->i_Type     = $i_type;
+    if ($errorsAlreadyPosted[$this->s_Title.$this->s_Message] > 1) {
+      /* Skip if the same message was already reported once */
+      return;
+    }
 
-      /* Append trace information, only if error messages are enabled */
-      if (isset($config) && is_object($config) &&
-        $config->get_cfg_value("displayerrors") == "TRUE") {
-        $this->a_Trace = debug_backtrace();
-      }
-      if (!session::is_set('msg_dialogs')) {
-        session::set('msg_dialogs', array());
-      }
-      if ($this->i_Type == FATAL_ERROR_DIALOG) {
-        restore_error_handler();
-        error_reporting(E_ALL);
-        echo $this->execute();
+    /* Append trace information, only if error messages are enabled */
+    if (isset($config) && is_object($config) &&
+      $config->get_cfg_value('displayerrors') == 'TRUE') {
+      $this->a_Trace = debug_backtrace();
+    }
+    if ($this->i_Type == FATAL_ERROR_DIALOG) {
+      restore_error_handler();
+      error_reporting(E_ALL);
+      echo $this->execute();
+    } else {
+      if (session::is_set('msg_dialogs')) {
+        $msg_dialogs = session::get('msg_dialogs');
       } else {
-        $msg_dialogs   = session::get('msg_dialogs');
-        $msg_dialogs[] = $this;
-        session::set('msg_dialogs', $msg_dialogs);
+        $msg_dialogs = array();
       }
+      $msg_dialogs[] = $this;
+      session::set('msg_dialogs', $msg_dialogs);
     }
-    session::set('errorsAlreadyPosted', $errorsAlreadyPosted);
   }
 
   /*!
@@ -114,7 +121,8 @@ class msg_dialog
    */
   public static function display($s_title, $s_message, $i_type = INFO_DIALOG)
   {
-    new msg_dialog($s_title, $s_message, $i_type);
+    $dialog = new msg_dialog($s_title, $s_message, $i_type);
+    $dialog->show();
   }
 
   /*
@@ -125,7 +133,7 @@ class msg_dialog
   public static function displayChecks($messages)
   {
     foreach ($messages as $error) {
-      msg_dialog::display(_('Error'), $error, ERROR_DIALOG);
+      static::display(_('Error'), $error, ERROR_DIALOG);
     }
   }
 
diff --git a/include/class_objects.inc b/include/class_objects.inc
index f8c56856308707e336b1e2689794439286f66102..9acf7d62675d419b386bcc60ca31e92968a6b110 100644
--- a/include/class_objects.inc
+++ b/include/class_objects.inc
@@ -33,10 +33,11 @@ class objects
    * \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 ignored or checked? Defaults to FALSE.
+   * \param string  $scope scope, defaults to subtree. When using one, be careful what you put in $ou.
    *
    * \return The list of objects as an associative array (keys are dns)
    */
-  static function ls ($types, $attrs = NULL, $ou = NULL, $filter = '', $checkAcl = FALSE)
+  static function ls ($types, $attrs = NULL, $ou = NULL, $filter = '', $checkAcl = FALSE, $scope = 'subtree')
   {
     global $ui;
 
@@ -70,7 +71,7 @@ class objects
       $search_attrs = array($attrs);
     }
     try {
-      $ldap = static::search($types, $search_attrs, $ou, $filter);
+      $ldap = static::search($types, $search_attrs, $ou, $filter, $scope);
     } catch (NonExistingBranchException $e) {
       return array();
     }
@@ -124,7 +125,7 @@ class objects
     return $ldap->count();
   }
 
-  private static function search ($types, $search_attrs, $ou = NULL, $filter = '')
+  private static function search ($types, $search_attrs, $ou = NULL, $filter = '', $scope = 'subtree')
   {
     global $config;
 
@@ -162,7 +163,7 @@ class objects
       $filter = '(&'.$filter.'(|'.implode($typeFilters).'))';
     }
     $ldap->cd($ou);
-    $ldap->search($filter, $search_attrs);
+    $ldap->search($filter, $search_attrs, $scope);
     if (!$ldap->success()) {
       throw new LDAPFailureException($ldap->get_error());
     }
@@ -179,7 +180,6 @@ class objects
    */
   static function open ($dn, $type)
   {
-
     $infos    = static::infos($type);
     $tabClass = $infos['tabClass'];
 
@@ -190,7 +190,7 @@ class objects
     return $tabObject;
   }
 
-  static function link($dn, $type, $subaction = '', $text = NULL, $icon = TRUE)
+  static function link ($dn, $type, $subaction = '', $text = NULL, $icon = TRUE)
   {
     global $config;
 
@@ -247,12 +247,27 @@ class objects
 
   static function isOfType ($attrs, $type)
   {
-    //TODO : cache ldapFilter objects?
-    $infos  = static::infos($type);
-    $filter = ldapFilter::parse($infos['filter']);
+    $filter = static::getFilterObject($type);
     return $filter($attrs);
   }
 
+  /* This method allows to cache parsed filter in filterObject key in objectTypes */
+  static function getFilterObject ($type)
+  {
+    global $config;
+
+    if (!isset($config->data['OBJECTS'][strtoupper($type)])) {
+      throw new NonExistingObjectTypeException('Non-existing type "'.$type.'"');
+    }
+
+    $infos =& $config->data['OBJECTS'][strtoupper($type)];
+
+    if (!isset($infos['filterObject'])) {
+      $infos['filterObject'] = ldapFilter::parse($infos['filter']);
+    }
+    return $infos['filterObject'];
+  }
+
   static function types ()
   {
     global $config;
@@ -261,7 +276,7 @@ class objects
 
   /* !\brief  This method returns a list of all available templates for the given type
    */
-  static function getTemplates($type, $requiredPermissions = 'r')
+  static function getTemplates ($type, $requiredPermissions = 'r')
   {
     global $config, $ui;
 
@@ -282,7 +297,7 @@ class objects
               continue;
             }
           }
-          $templates[$dn] = $attrs['cn'][0]." - ".LDAP::fix($key);
+          $templates[$dn] = $attrs['cn'][0].' - '.$key;
         }
       }
     }
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
deleted file mode 100644
index 00cfa8206bd4f9d110493a75b222d5d5a7827df6..0000000000000000000000000000000000000000
--- a/include/class_plugin.inc
+++ /dev/null
@@ -1,1756 +0,0 @@
-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  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_plugin.inc
- * Source code for the class plugin
- */
-class plugin
-{
-  /*!
-   * \brief Reference to parent object
-   *
-   * This variable is used when the plugin is included in tabs
-   * and keeps reference to the tab class. Communication to other
-   * tabs is possible by 'name'. So the 'fax' plugin can ask the
-   * 'userinfo' plugin for the fax number.
-   *
-   * \sa tab
-   */
-  public $parent = NULL;
-
-  /*!
-    \brief Mark plugin as account
-
-    Defines whether this plugin is defined as an account or not.
-    This has consequences for the plugin to be saved from tab
-    mode. If it is set to 'FALSE' the tab will call the delete
-    function, else the save function. Should be set to 'TRUE' if
-    the construtor detects a valid LDAP object.
-
-    \sa plugin::__construct()
-   */
-  var $is_account             = FALSE;
-  var $initially_was_account  = FALSE;
-
-  /*!
-    \brief Mark plugin as template
-
-    Defines whether we are creating a template or a normal object.
-    Has conseqences on the way execute() shows the formular and how
-    save() puts the data to LDAP.
-
-    \sa plugin::save() plugin::execute()
-   */
-  var $is_template    = FALSE;
-  var $ignore_account = FALSE;
-  var $is_modified    = FALSE;
-
-  /*!
-    \brief Represent temporary LDAP data
-
-    This is only used internally.
-   */
-  var $attrs = array();
-
-  /* Keep set of conflicting plugins */
-  var $conflicts = array();
-
-  /*!
-    \brief Used standard values
-
-    dn
-   */
-  var $dn         = "";
-  var $dialog     = FALSE;
-
-  /* attribute list for save action */
-  var $attributes       = array();
-  var $objectclasses    = array();
-  var $saved_attributes = array();
-
-  var $acl_base     = "";
-  var $acl_category = "";
-  // Used when the entry is opened as "readonly" due to locks.
-  var $read_only    = FALSE;
-
-  /* This can be set to render the tabulators in another stylesheet */
-  var $pl_notify = FALSE;
-
-  /*!
-   * \brief Object entry CSN
-   *
-   * If an entry was edited while we have edited the entry too,
-   * an error message will be shown.
-   * To configure this check correctly read the FAQ.
-   */
-  var $entryCSN = '';
-
-  /*!
-   * \brief plugin constructor
-   *
-   * If 'dn' is set, the node loads the given 'dn' from LDAP
-   *
-   * \param $config configuration
-   *
-   * \param $dn Distinguished name to initialize plugin from
-   *
-   * \param $object NULL
-   *
-   * \sa plugin()
-   */
-  function __construct ($dn = NULL, $object = NULL)
-  {
-    global $config;
-
-    $this->dn     = $dn;
-
-    // Ensure that we've a valid acl_category set.
-    if (empty($this->acl_category)) {
-      $tmp = pluglist::pluginInfos(get_class($this));
-      if (isset($tmp['plCategory'])) {
-        $c = key($tmp['plCategory']);
-        if (is_numeric($c)) {
-          $c = $tmp['plCategory'][0];
-        }
-        $this->acl_category = $c.'/';
-      }
-    }
-
-    /* Handle new accounts, don't read information from LDAP */
-    if ($this->dn != 'new') {
-      /* Check if this entry was opened in read only mode */
-      if (isset($_POST['open_readonly'])) {
-        if (session::global_is_set('LOCK_CACHE')) {
-          $cache = &session::get('LOCK_CACHE');
-          if (isset($cache['READ_ONLY'][$this->dn])) {
-            $this->read_only = TRUE;
-          }
-        }
-      }
-
-      /* Save current dn as acl_base */
-      $this->acl_base = $this->dn;
-    }
-
-    /* Get LDAP descriptor */
-    if (($this->dn != 'new' && $this->dn !== NULL) || ($object !== NULL)) {
-      /* Load data to 'attrs' and save 'dn' */
-      if ($object !== NULL) {
-        $this->attrs = $object->attrs;
-        if (isset($object->is_template)) {
-          $this->setTemplate($object->is_template);
-        }
-      } else {
-        $ldap = $config->get_ldap_link();
-        $ldap->cat($this->dn);
-        $this->attrs = $ldap->fetch();
-        if (empty($this->attrs)) {
-          throw new NonExistingLdapNodeException('Could not open dn '.$this->dn);
-        }
-        if ($this->mainTab) {
-          /* Make sure that initially_was_account is TRUE if we loaded an LDAP node,
-           *  even if it’s missing an objectClass */
-          $this->is_account = TRUE;
-        }
-      }
-
-      /* Set the template flag according to the existence of objectClass fdTemplate */
-      if (isset($this->attrs['objectClass'])) {
-        if (in_array_ics ('fdTemplate', $this->attrs['objectClass'])) {
-          @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Template check');
-          $this->templateLoadAttrs($this->attrs);
-        }
-      }
-
-      /* Is Account? */
-      if ($this->is_this_account($this->attrs)) {
-        $this->is_account = TRUE;
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Object check');
-      }
-    }
-
-    $this->loadAttributes();
-
-    $this->prepareSavedAttributes();
-
-    /* Save initial account state */
-    $this->initially_was_account = $this->is_account;
-  }
-
-  protected function loadAttributes()
-  {
-    /* Copy needed attributes */
-    foreach ($this->attributes as $val) {
-      $found = array_key_ics($val, $this->attrs);
-      if ($found != "") {
-        $this->$val = $found[0];
-      }
-    }
-  }
-
-  function is_this_account($attrs)
-  {
-    $found = TRUE;
-    foreach ($this->objectclasses as $obj) {
-      if (preg_match('/top/i', $obj)) {
-        continue;
-      }
-      if (!isset($attrs['objectClass']) || !in_array_ics ($obj, $attrs['objectClass'])) {
-        $found = FALSE;
-        break;
-      }
-    }
-    return $found;
-  }
-
-  function prepareSavedAttributes()
-  {
-    /* Prepare saved attributes */
-    $this->saved_attributes = $this->attrs;
-    foreach (array_keys($this->saved_attributes) as $index) {
-      if (is_numeric($index)) {
-        unset($this->saved_attributes[$index]);
-        continue;
-      }
-
-      if (!in_array_ics($index, $this->attributes) && strcasecmp('objectClass', $index)) {
-        unset($this->saved_attributes[$index]);
-        continue;
-      }
-
-      if (isset($this->saved_attributes[$index][0])) {
-        if (!isset($this->saved_attributes[$index]["count"])) {
-          $this->saved_attributes[$index]["count"] = count($this->saved_attributes[$index]);
-        }
-        if ($this->saved_attributes[$index]["count"] == 1) {
-          $tmp = $this->saved_attributes[$index][0];
-          unset($this->saved_attributes[$index]);
-          $this->saved_attributes[$index] = $tmp;
-          continue;
-        }
-      }
-      unset($this->saved_attributes[$index]["count"]);
-    }
-  }
-
-  /* Used by prepare_save and template::apply */
-  public function mergeObjectClasses(array $oc)
-  {
-    return array_merge_unique($oc, $this->objectclasses);
-  }
-
-  protected function templateLoadAttrs($template_attrs)
-  {
-    $this->is_template = TRUE;
-    if ($this->mainTab) {
-      $this->_template_cn = $template_attrs['cn'][0];
-    }
-    $this->attrs = static::tpl_template_to_attrs($template_attrs);
-  }
-
-  protected function templateSaveAttrs()
-  {
-    global $config;
-    $ldap = $config->get_ldap_link();
-    $ldap->cat($this->dn);
-    $template_attrs = $ldap->fetch();
-    if (!$template_attrs) {
-      if (!$this->mainTab) {
-        trigger_error('It seems main tab has not been saved.');
-      }
-      $template_attrs = array(
-        'objectClass'     => array('fdTemplate'),
-        'fdTemplateField' => array()
-      );
-    } else {
-      unset($template_attrs['dn']);
-      unset($template_attrs['fdTemplateField']['count']);
-      unset($template_attrs['objectClass']['count']);
-      unset($template_attrs['cn']['count']);
-      for ($i = 0; $i < $template_attrs['count']; ++$i) {
-        // Remove numeric keys
-        unset($template_attrs[$i]);
-      }
-      unset($template_attrs['count']);
-    }
-    if ($this->mainTab) {
-      $template_attrs['cn'] = $this->_template_cn;
-    }
-    /* First remove all concerned values */
-    foreach ($template_attrs['fdTemplateField'] as $key => $value) {
-      preg_match('/^([^:]+):(.*)$/s', $value, $m);
-      if (isset($this->attrs[$m[1]])) {
-        unset($template_attrs['fdTemplateField'][$key]);
-      }
-    }
-    /* Then insert non-empty values */
-    foreach ($this->attrs as $key => $value) {
-      if (is_array($value)) {
-        foreach ($value as $v) {
-          if ($value == "") {
-            continue;
-          }
-          $template_attrs['fdTemplateField'][] = $key.':'.$v;
-        }
-      } else {
-        if ($value == "") {
-          continue;
-        }
-        $template_attrs['fdTemplateField'][] = $key.':'.$value;
-      }
-    }
-    sort($template_attrs['fdTemplateField']);
-    return $template_attrs;
-  }
-
-  /*!
-   * \brief This function is called on the copied object to set its dn to where it will be saved
-   */
-  function resetCopyInfos()
-  {
-    $this->dn       = 'new';
-    $this->orig_dn  = $this->dn;
-
-    $this->saved_attributes       = array();
-    $this->initially_was_account  = FALSE;
-
-    $this->postCopyHook();
-  }
-
-
-  /*!
-   * \brief Generates the html output for this node
-   */
-  function execute()
-  {
-    /* Reset Lock message POST/GET check array, to prevent perg_match errors*/
-    session::set('LOCK_VARS_TO_USE', array());
-    session::set('LOCK_VARS_USED_GET', array());
-    session::set('LOCK_VARS_USED_POST', array());
-    session::set('LOCK_VARS_USED_REQUEST', array());
-  }
-
-  /*!
-   * \brief Removes object from parent
-   */
-  function remove_from_parent()
-  {
-    global $config;
-    $this->attrs = array();
-
-    if (!$this->mainTab) {
-      /* include global link_info */
-      $ldap = $config->get_ldap_link();
-
-      /* Get current objectClasses in order to add the required ones */
-      $ldap->cat($this->dn);
-      $tmp  = $ldap->fetch ();
-      $oc   = array();
-      if ($this->is_template) {
-        if (isset($tmp['fdTemplateField'])) {
-          foreach ($tmp['fdTemplateField'] as $tpl_field) {
-            if (preg_match('/^objectClass:(.+)$/', $tpl_field, $m)) {
-              $oc[] = $m[1];
-            }
-          }
-        }
-      } else {
-        if (isset($tmp['objectClass'])) {
-          $oc = $tmp['objectClass'];
-          unset($oc['count']);
-        }
-      }
-
-      /* Remove objectClasses from entry */
-      $this->attrs['objectClass'] = array_remove_entries_ics($this->objectclasses, $oc);
-
-      /* Unset attributes from entry */
-      foreach ($this->attributes as $val) {
-        $this->attrs["$val"] = array();
-      }
-    }
-
-    if ($this->initially_was_account) {
-      $this->handle_pre_events('remove');
-    }
-  }
-
-
-  /*!
-   * \brief Save HTML posted data to object
-   */
-  function save_object()
-  {
-    /* Save values to object */
-    foreach ($this->attributes as $val) {
-      if ($this->acl_is_writeable($val) && isset ($_POST["$val"])) {
-        /* Check for modifications */
-        $data = $_POST["$val"];
-
-        if ($this->$val != $data) {
-          $this->is_modified = TRUE;
-        }
-
-        $this->$val = $data;
-
-        /* Okay, how can I explain this fix ...
-         * In firefox, disabled option fields aren't selectable ... but in IE you can select these fileds.
-         * So IE posts these 'unselectable' option, with value = chr(194)
-         * chr(194) seems to be the &nbsp; in between the ...option>&nbsp;</option.. because there is no value=".." specified in these option fields
-         * This &nbsp; was added for W3c compliance, but now causes these ... ldap errors ...
-         * So we set these Fields to ""; a normal empty string, and we can check these values in plugin::check() again ...
-         */
-        if (isset($data[0]) && ($data[0] == chr(194))) {
-          $data = "";
-        }
-        $this->$val = $data;
-      }
-    }
-  }
-
-
-  /*!
-   * \brief Save data to LDAP, depending on is_account we save or delete
-   */
-  function save()
-  {
-    global $config;
-    /* include global link_info */
-    $ldap = $config->get_ldap_link();
-
-    $this->entryCSN = '';
-
-    /* Start with empty array */
-    $this->attrs = array();
-
-    /* Get current objectClasses in order to add the required ones */
-    $ldap->cat($this->dn);
-
-    $tmp = $ldap->fetch();
-    $oc = array();
-
-    if ($this->is_template) {
-      if (isset($tmp['fdTemplateField'])) {
-        foreach ($tmp['fdTemplateField'] as $tpl_field) {
-          if (preg_match('/^objectClass:(.+)$/', $tpl_field, $m)) {
-            $oc[] = $m[1];
-          }
-        }
-      }
-    } else {
-      if (isset($tmp['objectClass'])) {
-        $oc = $tmp['objectClass'];
-        unset($oc['count']);
-      }
-    }
-    $is_new = empty($oc);
-
-    /* Load (minimum) attributes, add missing ones */
-    $this->attrs['objectClass'] = $this->mergeObjectClasses($oc);
-
-    /* Copy standard attributes */
-    foreach ($this->attributes as $val) {
-      if ($this->$val != "") {
-        $this->attrs["$val"] = $this->$val;
-      } elseif (!$is_new) {
-        $this->attrs["$val"] = array();
-      }
-    }
-
-    if ($this->initially_was_account) {
-      $this->handle_pre_events('modify');
-    } else {
-      $this->handle_pre_events('add');
-    }
-  }
-
-  /*!
-   * \brief Remove attributes, empty arrays, arrays
-   * single attributes that do not differ
-   */
-  function cleanup()
-  {
-    foreach ($this->attrs as $index => $value) {
-
-      /* 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 &&
-          isset($this->saved_attributes[$index]) &&
-          !is_array($this->saved_attributes[$index])) {
-        $this->attrs[$index] = $this->attrs[$index][0];
-      }
-
-      /* Remove emtpy arrays if they do not differ */
-      if (is_array($this->attrs[$index]) &&
-          count($this->attrs[$index]) == 0 &&
-          !isset($this->saved_attributes[$index])) {
-        unset ($this->attrs[$index]);
-        continue;
-      }
-
-      /* Remove single attributes that do not differ */
-      if (!is_array($this->attrs[$index]) &&
-          isset($this->saved_attributes[$index]) &&
-          !is_array($this->saved_attributes[$index]) &&
-          $this->attrs[$index] == $this->saved_attributes[$index]) {
-        unset ($this->attrs[$index]);
-        continue;
-      }
-
-      /* Remove arrays that do not differ */
-      if (is_array($this->attrs[$index]) &&
-          isset($this->saved_attributes[$index]) &&
-          is_array($this->saved_attributes[$index])) {
-        if (!array_differs($this->attrs[$index], $this->saved_attributes[$index])) {
-          unset ($this->attrs[$index]);
-          continue;
-        }
-      }
-    }
-
-    /* Update saved attributes and ensure that next cleanups will be successful too */
-    foreach ($this->attrs as $name => $value) {
-      $this->saved_attributes[$name] = $value;
-    }
-  }
-
-  /*!
-   * \brief Check formular input
-   */
-  function check()
-  {
-    $message = array();
-
-    $this->callHook('CHECK', array(), $returnOutput);
-    if (!empty($returnOutput)) {
-      $message[] = join("\n", $returnOutput);
-    }
-
-    /* Check entryCSN */
-    if (!empty($this->entryCSN)) {
-      $current_csn = getEntryCSN($this->dn);
-      if (($current_csn != $this->entryCSN) && !empty($current_csn)) {
-        $this->entryCSN = $current_csn;
-        $message[] = _('The object has changed since opened in FusionDirectory. All changes that may be done by others will get lost if you save this entry!');
-      }
-    }
-    return $message;
-  }
-
-  /*
-   * \brief Adapt from template, using 'dn'
-   *
-   * \param string $dn The DN
-   *
-   * \param array $skip A new array
-   */
-  function adapt_from_template($attrs, $skip = array())
-  {
-    $this->attrs = $attrs;
-
-    /* Walk through attributes */
-    foreach ($this->attributes as $val) {
-      /* Skip the ones in skip list */
-      if (in_array($val, $skip)) {
-        continue;
-      }
-
-      if (isset($this->attrs["$val"][0])) {
-        $this->$val = $this->attrs["$val"][0];
-      }
-    }
-
-    /* Is Account? */
-    $this->is_account = $this->is_this_account($this->attrs);
-  }
-
-  public function setNeedEditMode ($bool)
-  {
-  }
-
-  function setTemplate ($bool)
-  {
-    $this->is_template = $bool;
-  }
-
-  static function tpl_fetch_template($dn)
-  {
-    global $config;
-
-    $ldap = $config->get_ldap_link();
-    $ldap->cat($dn);
-    $attrs    = $ldap->fetch();
-    $attrs    = static::tpl_template_to_attrs($attrs);
-    $depends  = static::tpl_attrs_depends($attrs);
-    $attrs    = static::tpl_sort_attrs($attrs, $depends);
-    return array($attrs, $depends);
-  }
-
-  static function tpl_template_to_attrs($template_attrs)
-  {
-    /* Translate template attrs into $attrs as if taken from LDAP */
-    unset($template_attrs['fdTemplateField']['count']);
-    sort($template_attrs['fdTemplateField']);
-    $attrs = array();
-    foreach ($template_attrs['fdTemplateField'] as $field) {
-      preg_match('/^([^:]+):(.*)$/s', $field, $m);
-      if (isset($attrs[$m[1]])) {
-        $attrs[$m[1]][] = $m[2];
-        $attrs[$m[1]]['count']++;
-      } else {
-        $attrs[$m[1]]           = array($m[2]);
-        $attrs[$m[1]]['count']  = 1;
-      }
-    }
-    return $attrs;
-  }
-
-  /* Apply a modifier
-   * Returns an array of possible values */
-  static function tpl_apply_modifier($m, $args, $str)
-  {
-    mb_internal_encoding('UTF-8');
-    mb_regex_encoding('UTF-8');
-    if (is_array($str) && (strtolower($m) == $m)) {
-      /* $str is an array and $m is lowercase, so it's a string modifier */
-      $str = $str[0];
-    }
-    switch ($m) {
-      case 'F': // First
-        return array($str[0]);
-      case 'L': // Last
-        return array(end($str));
-      case 'J': // Join
-        if (isset($args[0])) {
-          return array(join($args[0], $str));
-        } else {
-          return array(join($str));
-        }
-      case 'C': // Count
-        return array(count($str));
-      case 'c': // comment
-        return array('');
-      case 'b': // base64
-        if (isset($args[0]) && ($args[0] == 'd')) {
-          return array(base64_decode($str));
-        }
-        return array(base64_encode($str));
-      case 'u': // uppercase
-        return array(mb_strtoupper($str, 'UTF-8'));
-      case 'l': // lowercase
-        return array(mb_strtolower($str, 'UTF-8'));
-      case 'a': // remove accent
-        $str = htmlentities($str, ENT_NOQUOTES, 'UTF-8');
-
-        $str = preg_replace('#&([A-za-z])(?:acute|cedil|circ|grave|orn|ring|slash|th|tilde|uml);#', '\1', $str);
-        // handle ligatures
-        $str = preg_replace('#&([A-za-z]{2})(?:lig);#', '\1', $str);
-        // delete unhandled characters
-        return array(preg_replace('#&[^;]+;#', '', $str));
-      case 't': // translit
-        $localesaved = setlocale(LC_CTYPE, 0);
-        $ret = array();
-        foreach ($args as $arg) {
-          setlocale(LC_CTYPE, array($arg,"$arg.UTF8"));
-          $ret[] = iconv('UTF8', 'ASCII//TRANSLIT', $str);
-        }
-        setlocale(LC_CTYPE, $localesaved);
-        return array_unique($ret);
-      case 'p': // spaces
-        return array(preg_replace('/\s/u', '', $str));
-      case 's': // substring
-        if (count($args) < 1) {
-          trigger_error("Missing 's' substr modifier parameter");
-        }
-        if (count($args) < 2) {
-          array_unshift($args, 0);
-        }
-        if (preg_match('/^(\d+)-(\d+)$/', $args[1], $m)) {
-          $res = array();
-          for ($i = $m[1];$i < $m[2]; ++$i) {
-            $res[] = substr($str, $args[0], $i);
-          }
-          return array_unique($res);
-        } else {
-          return array(substr($str, $args[0], $args[1]));
-        }
-      case 'r': // random string
-        $length = 8;
-        $chars  = 'b';
-        if (count($args) >= 2) {
-          $length = mt_rand($args[0], $args[1]);
-          if (count($args) >= 3) {
-            $chars = $args[2];
-          }
-        } elseif (count($args) >= 1) {
-          $length = $args[0];
-        }
-        $res = '';
-        for ($i = 0; $i < $length; ++$i) {
-          switch ($chars) {
-            case 'd':
-              /* digits */
-              $res .= (string)rand(0, 9);
-            break;
-            case 'l':
-              /* letters */
-              $nb = mt_rand(65, 116);
-              if ($nb > 90) {
-                /* lowercase */
-                $nb += 6;
-              }
-              $res .= chr($nb);
-            break;
-            case 'b':
-              /* both */
-            default:
-              $nb = mt_rand(65, 126);
-              if ($nb > 116) {
-                /* digit */
-                $nb = (string)($nb - 117);
-              } else {
-                if ($nb > 90) {
-                  /* lowercase */
-                  $nb += 6;
-                }
-                $nb = chr($nb);
-              }
-              $res .= $nb;
-            break;
-          }
-        }
-        return array($res);
-      default:
-        trigger_error("Unkown modifier '$m'");
-        return array($str);
-    }
-  }
-
-  static function tpl_parse_mask($mask, $attrs)
-  {
-    if ($mask == '|') {
-      return array('%');
-    }
-    $modifiers = '';
-    if (preg_match('/^([^|]+)\|/', $mask, $m)) {
-      $modifiers = $m[1];
-      $mask = substr($mask, strlen($m[0]));
-    }
-    $result = array('');
-    if (isset($attrs[$mask])) {
-      $result = array($attrs[$mask]);
-      if (is_array($result[0])) {
-        unset($result[0]['count']);
-      }
-    } elseif (($mask != '') && !preg_match('/c/', $modifiers)) {
-      trigger_error("'$mask' was not found in attributes");
-    }
-    $len    = strlen($modifiers);
-    for ($i = 0; $i < $len; ++$i) {
-      $args     = array();
-      $modifier = $modifiers[$i];
-      if (preg_match('/^\[([^\]]+)\].*$/', substr($modifiers, $i + 1), $m)) {
-        /* get modifier args */
-        $args = explode(',', $m[1]);
-        $i += strlen($m[1]) + 2;
-      }
-      $result_tmp = array();
-      foreach ($result as $r) {
-        $result_tmp = array_merge($result_tmp, static::tpl_apply_modifier($modifier, $args, $r));
-      }
-      $result = $result_tmp;
-    }
-    // Array that were not converted by a modifier into a string are now converted to strings
-    foreach ($result as &$r) {
-      if (is_array($r)) {
-        $r = reset($r);
-      }
-    }
-    unset($r);
-    return $result;
-  }
-
-  static function tpl_depends_of (&$cache, $depends, $key, $forbidden = array())
-  {
-    if (isset($cache[$key])) {
-      return $cache[$key];
-    }
-
-    $forbidden[] = $key;
-
-    $array =
-      array_map(
-        function ($a) use (&$cache, $depends, $forbidden, $key)
-        {
-          if (in_array($a, $forbidden)) {
-            msg_dialog::display(
-              _('Error'),
-              sprintf(
-                _('Recursive dependency in the template fields: "%1$s" cannot depend on "%2$s" as "%2$s" already depends on "%1$s"'),
-                $key,
-                $a
-              ),
-              ERROR_DIALOG
-            );
-            return array();
-          }
-          $deps = plugin::tpl_depends_of ($cache, $depends, $a, $forbidden);
-          if (($askmeKey = array_search('askme', $deps)) !== FALSE) {
-            /* Do not flat special askme dependency */
-            unset($deps[$askmeKey]);
-          }
-          return $deps;
-        },
-        $depends[$key]
-      );
-    $array[]      = $depends[$key];
-    $cache[$key]  = array_unique(call_user_func_array('array_merge_recursive', $array));
-    return $cache[$key];
-  }
-
-  static function tpl_attrs_depends($attrs)
-  {
-    /* Compute dependencies of each attr */
-    $depends = array();
-    foreach ($attrs as $key => $values) {
-      $depends[$key] = array();
-      if (!is_array($values))  {
-        $values = array($values);
-      }
-      unset ($values['count']);
-      foreach ($values as $value) {
-        $offset = 0;
-        while (preg_match('/%([^%\|]+\|)?([^%]+)%/', $value, $m, PREG_OFFSET_CAPTURE, $offset)) {
-          $offset = $m[0][1] + strlen($m[0][0]);
-          $depends[$key][] = $m[2][0];
-          // Dependency which has no value might be missing
-          if (!isset($attrs[$m[2][0]])) {
-            $attrs[$m[2][0]]    = array();
-            $depends[$m[2][0]]  = array();
-          }
-        }
-      }
-    }
-    /* Flattens dependencies */
-    $flatdepends = array();
-    foreach ($depends as $key => $value) {
-      static::tpl_depends_of($flatdepends, $depends, $key);
-    }
-    return $flatdepends;
-  }
-
-  static function tpl_sort_attrs($attrs, $flatdepends)
-  {
-    /* Sort attrs depending of dependencies */
-    uksort($attrs, function ($k1, $k2) use ($flatdepends) {
-      if (in_array($k1, $flatdepends[$k2])) {
-        return -1;
-      } elseif (in_array($k2, $flatdepends[$k1])) {
-        return 1;
-        // When no direct dependency, we sort by number of dependencies
-      } else {
-        $c1 = count($flatdepends[$k1]);
-        $c2 = count($flatdepends[$k2]);
-        if ($c1 == $c2) {
-            return 0;
-        }
-        return (($c1 < $c2) ? -1 : 1);
-      }
-    });
-    return $attrs;
-  }
-
-  /*! Brief Return attrs needed before applying template
-   *
-   * return an array of attributes which are needed by the template
-   */
-  static function tpl_needed_attrs(&$attrs, $flatdepends)
-  {
-    $needed = array();
-    foreach ($flatdepends as $attr => $depends) {
-      if ((isset($depends[0])) && ($depends[0] == 'askme')) {
-        $needed[] = $attr;
-        unset($flatdepends[$attr]);
-        unset($attrs[$attr]);
-      }
-    }
-    $dependencies = array_unique(call_user_func_array('array_merge', $flatdepends));
-    foreach ($dependencies as $attr) {
-      if (empty($flatdepends[$attr])) {
-        $needed[] = $attr;
-      }
-    }
-    return array_unique($needed);
-  }
-
-  /*! Brief Parse attrs template masks
-   *
-   * return an array with the final values of attributes
-   */
-  static function tpl_parse_attrs($attrs)
-  {
-    foreach ($attrs as &$attr) {
-      if (is_array($attr)) {
-        foreach ($attr as $key => &$string) {
-          if (!is_numeric($key)) {
-            continue;
-          }
-          $string = static::tpl_parse_string($string, $attrs);
-        }
-        unset($string);
-      }
-    }
-    unset($attr);
-    return $attrs;
-  }
-
-  /*! Brief Parse template masks in a single string
-   *
-   * return the string with patterns replaced by their values
-   */
-  static function tpl_parse_string($string, $attrs, $escapeMethod = NULL)
-  {
-    if (preg_match('/^%%/', $string)) {
-      /* Special case: %% at beginning of string means do not touch it. Used by binary attributes. */
-      return preg_replace('/^%%/', '', $string);
-    }
-    $offset = 0;
-    while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
-      $replace  = static::tpl_parse_mask($m[1][0], $attrs);
-      $replace  = $replace[0];
-      if ($escapeMethod !== NULL) {
-        $replace = $escapeMethod($replace);
-      }
-      $string   = substr_replace($string, $replace, $m[0][1], strlen($m[0][0]));
-      $offset   = $m[0][1] + strlen($replace);
-    }
-    return $string;
-  }
-
-  /*! Brief Parse template masks in a single string and list the fields it needs
-   *
-   * return An array with the names of the fields used in the string pattern
-   */
-  static function tpl_list_fields($string)
-  {
-    $fields = array();
-    $offset = 0;
-    while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
-      $mask   = $m[1][0];
-      $offset = $m[0][1] + strlen($m[0][0]);
-      if ($mask == '|') {
-        continue;
-      }
-      if (preg_match('/^([^|]+)\|/', $mask, $m)) {
-        $mask = substr($mask, strlen($m[0]));
-      }
-      $fields[] = $mask;
-    }
-    return $fields;
-  }
-
-  /*!
-   * \brief Show header message for tab dialogs
-   *
-   * \param string $button_text The button text
-   *
-   * \param string $text The text
-   *
-   * \param boolean $disabled FALSE
-   */
-  function show_enable_header($button_text, $text, $disabled = FALSE, $name = 'modify_state')
-  {
-    return $this->show_header($button_text, $text, FALSE, $disabled, $name);
-  }
-
-  /*!
-   * \brief Show header message for tab dialogs
-   *
-   * \param string $button_text The button text
-   *
-   * \param string $text The text
-   *
-   * \param boolean $disabled FALSE
-   */
-  function show_disable_header($button_text, $text, $disabled = FALSE, $name = 'modify_state')
-  {
-    return $this->show_header($button_text, $text, TRUE, $disabled, $name);
-  }
-
-  /*!
-   * \brief Show header message for tab dialogs
-   *
-   * \param string $button_text The button text
-   *
-   * \param string $text The text
-   *
-   * \param boolean $plugin_enabled
-   *
-   * \param boolean $button_disabled FALSE
-   */
-  function show_header($button_text, $text, $plugin_enabled, $button_disabled = FALSE, $name = 'modify_state')
-  {
-    if ($button_disabled || ((!$this->acl_is_createable() && !$plugin_enabled) || (!$this->acl_is_removeable() && $plugin_enabled))) {
-      $state = 'disabled="disabled"';
-    } else {
-      $state = '';
-    }
-    $display = '<div width="100%"><p><b>'.$text.'</b><br/>'."\n";
-    $display .= '<input type="submit" value="'.$button_text.'" name="'.$name.'" '.$state.'></p></div><hr class="separator"/>';
-
-    return $display;
-  }
-
-  /*!
-   * \brief Executes a command after an object has been copied
-   */
-  function postCopyHook()
-  {
-  }
-
-  /*!
-   * \brief Create unique DN
-   *
-   * \param string $attribute
-   *
-   * \param string $base
-   */
-  function create_unique_dn($attribute, $base)
-  {
-    global $config;
-    $ldap = $config->get_ldap_link();
-    $base = preg_replace('/^,*/', '', $base);
-
-    /* Try to use plain entry first */
-    $dn = $attribute.'='.ldap_escape_dn($this->$attribute).','.$base;
-    if ($dn == $this->orig_dn) {
-      return $dn;
-    }
-    $ldap->cat($dn, array('dn'));
-    if (!$ldap->fetch()) {
-      return $dn;
-    }
-
-    /* Look for additional attributes */
-    foreach ($this->attributes as $attr) {
-      if ($attr == $attribute || $this->$attr == "" || is_array($this->$attr)) {
-        continue;
-      }
-
-      $dn = $attribute.'='.ldap_escape_dn($this->$attribute).'+'.$attr.'='.ldap_escape_dn($this->$attr).','.$base;
-      if ($dn == $this->orig_dn) {
-        return $dn;
-      }
-      $ldap->cat($dn, array('dn'));
-      if (!$ldap->fetch()) {
-        return $dn;
-      }
-    }
-
-    /* None found */
-    return 'none';
-  }
-
-  /*!
-   * \brief  Rename/Move a given src_dn to the given dest_dn
-   *
-   * Move a given ldap object indentified by $src_dn to the
-   * given destination $dst_dn
-   *
-   * \param  string  $src_dn the source DN.
-   *
-   * \param  string  $dst_dn the destination DN.
-   *
-   * \return boolean TRUE on success else FALSE.
-   */
-  private function rename($src_dn, $dst_dn)
-  {
-    global $config;
-    /* Try to move the source entry to the destination position */
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->create_missing_trees(preg_replace("/^[^,]+,/", '', $dst_dn));
-    if (!$ldap->rename_dn($src_dn, $dst_dn)) {
-      logging::log('debug', 'Ldap Protocol v3 implementation error, ldap_rename failed.',
-              "FROM: $src_dn  -- TO: $dst_dn", array(), $ldap->get_error());
-      @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, "Rename failed FROM: $src_dn  -- TO:  $dst_dn",
-          'Ldap Protocol v3 implementation error. Error:'.$ldap->get_error());
-      return FALSE;
-    }
-
-    return TRUE;
-  }
-
-
-   /*!
-    * \brief Move ldap entries from one place to another
-    *
-    * \param  string  $src_dn the source DN.
-    *
-    * \param  string  $dst_dn the destination DN.
-    */
-  function move($src_dn, $dst_dn)
-  {
-    global $config;
-    /* Do not move if only upper- lowercase has changed */
-    if (strtolower($src_dn) == strtolower($dst_dn)) {
-      return TRUE;
-    }
-
-    /* Try to move with ldap routines */
-    if (!$this->rename($src_dn, $dst_dn)) {
-      return FALSE;
-    }
-
-    /* Get list of users,groups and roles within this tree,
-        maybe we have to update ACL references.
-        * TODO : replace this with a call to handleForeignKeys on sub objects
-     */
-    $leaf_objs = get_list("(|(objectClass=posixGroup)(objectClass=inetOrgPerson)(objectClass=gosaRole))", array("all"), $dst_dn,
-                          array("dn","objectClass"), GL_SUBSEARCH | GL_NO_ACL_CHECK);
-    foreach ($leaf_objs as $obj) {
-      $new_dn = $obj['dn'];
-      $old_dn = preg_replace("/".preg_quote(LDAP::convert($dst_dn), '/')."$/i", $src_dn, LDAP::convert($new_dn));
-      $this->update_acls($old_dn, $new_dn);
-    }
-
-    /* Check if there are gosa departments moved.
-       If there were deps moved, the force reload of config->deps.
-     */
-    $leaf_deps = get_list("(objectClass=gosaDepartment)", array("all"), $dst_dn,
-                            array("dn","objectClass"), GL_SUBSEARCH | GL_NO_ACL_CHECK);
-
-    if (count($leaf_deps)) {
-      $config->get_departments();
-      $config->make_idepartments();
-      session::global_set("config", $config);
-      $ui = get_userinfo();
-      $ui->reset_acl_cache();
-    }
-
-    $this->handleForeignKeys($src_dn, $dst_dn);
-    return TRUE;
-  }
-
-  /*! \brief This function returns an LDAP filter for this plugin object classes
-   */
-  function getObjectClassFilter ()
-  {
-    if (!empty($this->objectclasses)) {
-      return '(&(objectClass='.implode(')(objectClass=', $this->objectclasses).'))';
-    } else {
-      return '';
-    }
-  }
-
-  function handleForeignKeys ($olddn = NULL, $newdn = NULL, $mode = 'move')
-  {
-    if (($olddn !== NULL) && ($olddn == $newdn)) {
-      return;
-    }
-    if ($this->is_template) {
-      return;
-    }
-    $this->browseForeignKeys(
-      'handle_'.$mode,
-      $olddn,
-      $newdn
-    );
-  }
-
-  function browseForeignKeys($mode, $param1 = NULL, $param2 = NULL)
-  {
-    if (preg_match('/^handle_/', $mode)) {
-      $olddn    = $param1;
-      $newdn    = $param2;
-      $classes  = array(get_class($this));
-    } elseif ($mode == 'references') {
-      $classes = array_keys($this->parent->by_object);
-    }
-    // We group by objetType concerned
-    $foreignRefs = array();
-    foreach ($classes as $tabclass) {
-      $infos = pluglist::pluginInfos($tabclass);
-      foreach ($infos['plForeignRefs'] as $field => $refs) {
-        if (preg_match('/^handle_/', $mode)) {
-          if ($newdn !== NULL) {
-            // Move action
-            if (($field != 'dn') && ($mode == 'handle_move')) {
-              // We only change dn
-              continue;
-            }
-          } elseif ($olddn === NULL) {
-            // Edit action
-            if ($field == 'dn') {
-              // dn did not change
-              continue;
-            } elseif (!$this->attributeHaveChanged($field)) {
-              // only look at changed attributes
-              continue;
-            }
-          }
-          // else = delete action, all fields are concerned, nothing to do here
-        }
-        foreach ($refs as $ref) {
-          $class  = $ref[0];
-          $ofield = $ref[1];
-          $filter = $ref[2];
-          $cinfos = pluglist::pluginInfos($class);
-          if (is_subclass_of($class, 'simpleService')) {
-            $objectTypes = array('server');
-          } else {
-            $objectTypes = $cinfos['plObjectType'];
-          }
-          foreach ($objectTypes as $key => $objectType) {
-            if (!is_numeric($key)) {
-              $objectType = $key;
-            }
-            if (preg_match('/^handle_/', $mode)) {
-              if ($field == 'dn') {
-                $oldvalue = $olddn;
-                $newvalue = $newdn;
-              } elseif (($olddn !== NULL) && ($newdn === NULL)) {
-                $oldvalue = $this->attributeInitialValue($field);
-                $newvalue = NULL;
-              } else {
-                $oldvalue = $this->attributeInitialValue($field);
-                $newvalue = $this->attributeValue($field);
-              }
-              $foreignRefs[$objectType]['refs'][$class][$ofield] =
-                array(
-                  'field'     => $field,
-                  'oldvalue'  => $oldvalue,
-                  'newvalue'  => $newvalue,
-                  'tab'       => $tabclass,
-                );
-              $filter = plugin::tpl_parse_string($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] =
-                array(
-                  'tab'     => $tabclass,
-                  'tabname' => $this->parent->by_name[$tabclass],
-                  'field'   => $field,
-                  'value'   => $this->parent->by_object[$tabclass]->$field,
-                );
-              $filter = plugin::tpl_parse_string($filter, array('oldvalue' => $this->parent->by_object[$tabclass]->$field), 'ldap_escape_f');
-            }
-            if (!preg_match('/^\(.*\)$/', $filter)) {
-              $filter = '('.$filter.')';
-            }
-            $foreignRefs[$objectType]['filters'][$filter] = $filter;
-          }
-        }
-      }
-    }
-
-    /* Back up POST content */
-    $SAVED_POST = $_POST;
-    $refs = array();
-    // For each concerned objectType
-    foreach ($foreignRefs as $objectType => $tabRefs) {
-      // Compute filter
-      $filters = array_values($tabRefs['filters']);
-      $filter = '(|'.join($filters).')';
-      // Search objects
-      try {
-        $objects = objects::ls($objectType, array('dn' => 'raw'), NULL, $filter);
-      } catch (NonExistingObjectTypeException $e) {
-        continue;
-      } catch (EmptyFilterException $e) {
-        continue;
-      }
-      // For each object of this type
-      foreach (array_keys($objects) as $dn) {
-        /* Avoid sending POST to opened objects */
-        $_POST = array();
-        // Build the object
-        $tabobject = objects::open($dn, $objectType);
-        if (preg_match('/^handle_/', $mode)) {
-          // For each tab concerned
-          foreach ($tabRefs['refs'] as $tab => $fieldRefs) {
-            // If the tab is activated on this object
-            $pluginobject = $tabobject->getTabOrServiceObject($tab);
-            if ($pluginobject !== FALSE) {
-              // For each field
-              foreach ($fieldRefs as $ofield => $field) {
-                // call plugin::foreignKeyUpdate(ldapname, oldvalue, newvalue, source) on the object
-                $pluginobject->foreignKeyUpdate(
-                  $ofield,
-                  $field['oldvalue'],
-                  $field['newvalue'],
-                  array(
-                    'CLASS' => $field['tab'],
-                    'FIELD' => $field['field'],
-                    'MODE'  => preg_replace('/^handle_/', '', $mode),
-                    'DN'    => $this->dn,
-                  )
-                );
-              }
-              $pluginobject->save_object();
-              $pluginobject->save();
-            }
-          }
-        } elseif ($mode == 'references') {
-          // For each tab concerned
-          foreach ($tabRefs['refs'] as $tab => $tab_infos) {
-            // If the tab is activated on this object
-            $pluginobject = $tabobject->getTabOrServiceObject($tab);
-            if ($pluginobject !== FALSE) {
-              // For each field
-              foreach ($tab_infos['fields'] as $ofield => $field) {
-                if ($pluginobject->foreignKeyCheck(
-                      $ofield,
-                      $field['value'],
-                      array(
-                        'CLASS' => $field['tab'],
-                        'FIELD' => $field['field'],
-                        'DN'    => $this->dn,
-                      )
-                    )) {
-                  if (!isset($refs[$dn])) {
-                    $refs[$dn] = array(
-                      'link'  => '',
-                      'tabs'  => array(),
-                    );
-                    try {
-                      $refs[$dn]['link'] = objects::link($dn, $objectType);
-                    } catch (Exception $e) {
-                      trigger_error("Could not create link to $dn: ".$e->getMessage());
-                      $refs[$dn]['link'] = $dn;
-                    }
-                  }
-                  if (!isset($refs[$dn]['tabs'][$tab])) {
-                    $refs[$dn]['tabs'][$tab] = array(
-                      'link'    => '',
-                      'fields'  => array(),
-                    );
-                    try {
-                      if (is_subclass_of($tab, 'simpleService')) {
-                        $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "service_$tab", sprintf(_('Service "%s"'), $tab_infos['name']));
-                      } else {
-                        $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "tab_$tab", sprintf(_('Tab "%s"'), $tab_infos['name']));
-                      }
-                    } catch (Exception $e) {
-                      trigger_error("Could not create link to $dn $tab: ".$e->getMessage());
-                      $refs[$dn]['tabs'][$tab]['link'] = $tab;
-                    }
-                  }
-                  $refs[$dn]['tabs'][$tab]['fields'][$ofield] = $field;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    /* Restore POST */
-    $_POST = $SAVED_POST;
-    if ($mode == 'references') {
-      return $refs;
-    }
-  }
-
-  protected function attributeValue($field)
-  {
-    return $this->$field;
-  }
-
-  protected function attributeInitialValue($field)
-  {
-    die("Foreign key was declared but there is no method attributeInitialValue to handle it!".
-      " Class:".get_class($this).", Field:$field");
-  }
-
-  protected function attributeHaveChanged($field)
-  {
-    die("Foreign key was declared but there is no method attributeHaveChanged to handle it!".
-      " Class:".get_class($this).", Field:$field");
-  }
-
-  /*
-   * Source is an array like this:
-   * array(
-   *  'CLASS' => class,
-   *  'FIELD' => field,
-   *  'DN'    => dn,
-   *  'MODE'  => mode
-   * )
-   * mode being either 'copy' or 'move', defaults to 'move'
-   */
-  function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
-  {
-    die("Foreign key was declared but there is no method foreignKeyUpdate to handle it!".
-      " Class:".get_class($this).", Field:$field, Source:(".join(',', $source).").");
-  }
-
-  function foreignKeyCheck ($field, $value, $source)
-  {
-    die("Foreign key was declared but there is no method foreignKeyCheck to handle it!".
-      " Class:".get_class($this).", Field:$field, Source:(".join(',', $source).").");
-  }
-
-
-  /* \brief Move/Rename complete trees
-   *
-   * \param  string  $src_dn the source DN.
-   *
-   * \param  string  $dst_dn the destination DN.
-   */
-  function recursive_move($src_dn, $dst_dn)
-  {
-    trigger_error('Deprecated method : plugin::recursive_move, use plugin::move instead');
-
-    return $this->move($src_dn, $dst_dn);
-  }
-
-  /*! \brief Forward command execution requests
-   *         to the pre/post hook execution method.
-   *
-   * \param  string  $when must be PRE or POST
-   *
-   * \param  string  $mode add, remove or modify
-   *
-   * \param  array  $addAttrs
-   */
-  protected function handle_hooks($when, $mode, $addAttrs = array())
-  {
-    switch ($mode) {
-      case 'add':
-        $this->callHook($when.'CREATE', $addAttrs);
-        break;
-
-      case 'modify':
-        $this->callHook($when.'MODIFY', $addAttrs);
-        break;
-
-      case 'remove':
-        $this->callHook($when.'REMOVE', $addAttrs);
-        break;
-
-      default:
-        trigger_error(sprintf('Invalid %s event type given %s! Valid types are [add,modify,remove].', strtolower($when), $mode));
-        break;
-    }
-  }
-
-  /*! \brief Forward command execution requests
-   *         to the post hook execution method.
-   */
-  function handle_post_events($mode, $addAttrs = array())
-  {
-    /* Update foreign keys */
-    if ($mode == 'remove') {
-      $this->handleForeignKeys($this->dn, NULL);
-    } elseif ($mode == 'modify') {
-      $this->handleForeignKeys();
-    }
-    return $this->handle_hooks('POST', $mode, $addAttrs);
-  }
-
-  /*!
-   *  \brief Forward command execution requests
-   *         to the pre hook execution method.
-   */
-  function handle_pre_events($mode, $addAttrs = array())
-  {
-    return $this->handle_hooks('PRE', $mode, $addAttrs);
-  }
-
-  /*!
-   * \brief    Calls external hooks which are defined for this plugin (fusiondirectory.conf)
-   *           Replaces placeholder by class values of this plugin instance.
-   *       Allows to a add special replacements.
-   */
-  function callHook($cmd, $addAttrs = array(), &$returnOutput = array(), &$returnCode = NULL)
-  {
-    if ($this->is_template) {
-      return;
-    }
-    global $config;
-    $command = $config->searchHook(get_class($this), $cmd);
-
-    if ($command != "") {
-      // Walk trough attributes list and add the plugins attributes.
-      foreach ($this->attributes as $attr) {
-        $addAttrs[$attr] = $this->$attr;
-      }
-
-      $ui = get_userinfo();
-
-      $addAttrs['callerDN']         = $ui->dn;
-      $addAttrs['callerCN']         = $ui->cn;
-      $addAttrs['callerUID']        = $ui->uid;
-      $addAttrs['callerSN']         = $ui->sn;
-      $addAttrs['callerGIVENNAME']  = $ui->givenName;
-
-      $addAttrs['dn']         = $this->dn;
-      $addAttrs['location']   = $config->current['NAME'];
-
-      if (isset($this->parent->by_object)) {
-        foreach ($this->parent->by_object as $object) {
-          foreach ($object->attributes as $attr) {
-            if (!isset($addAttrs[$attr])) {
-              $addAttrs[$attr] = $object->$attr;
-            }
-          }
-        }
-      }
-
-      $command = static::tpl_parse_string($command, $addAttrs, 'escapeshellarg');
-
-      // If there are still some %.. in our command, try to fill these with some other class vars (FIXME: useless)
-      if (preg_match("/%/", $command)) {
-        $addAttrs = array();
-        $attrs = get_object_vars($this);
-        foreach ($attrs as $name => $value) {
-          if (is_array($value)) {
-            $s = "";
-            foreach ($value as $val) {
-              if (is_string($val) || is_int($val) || is_float($val) || is_bool($val)) {
-                $s .= $val.'|';
-              }
-            }
-            $value = trim($s, '|');
-          }
-          if (!is_string($value) && !is_int($value) && !is_float($value) && !is_bool($value)) {
-            continue;
-          }
-          $addAttrs[$name] = $value;
-        }
-        $command = static::tpl_parse_string($command, $addAttrs, 'escapeshellarg');
-      }
-
-      @DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
-      exec($command, $arr, $returnCode);
-      $returnOutput = $arr;
-
-      if ($returnCode != 0) {
-        $str = implode("\n", $arr);
-        @DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execution failed code: ".$returnCode);
-        $message = msgPool::cmdexecfailed($cmd, $command, get_class($this));
-        if (!empty($str)) {
-          $message .= "Result: ".$str;
-        }
-        msg_dialog::display(_("Error"), $message, ERROR_DIALOG);
-      } elseif (is_array($arr)) {
-        $str = implode("\n", $arr);
-        @DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Result: ".$str);
-        if (!empty($str) && $config->get_cfg_value("displayHookOutput", "FALSE") == "TRUE") {
-          msg_dialog::display('['.get_class($this).' '.strtolower($cmd)."hook] $command", $str, INFO_DIALOG);
-        }
-      }
-    }
-  }
-
-  /*! \brief Test for removability of the object
-   *
-   * Allows testing of conditions for removal of object. If removal should be aborted
-   * the function needs to remove an error message.
-   */
-  function allow_remove()
-  {
-    $reason = "";
-    return $reason;
-  }
-
-  /*!
-   * \brief Return plugin informations for acl handling
-   *
-   * \return an array
-   */
-  static function plInfo()
-  {
-    return array();
-  }
-
-  /*!
-   * \brief Set acl base
-   *
-   * \param string $base
-   */
-  function set_acl_base($base)
-  {
-    $this->acl_base = $base;
-  }
-
-  /*!
-   * \brief Set acl category
-   *
-   * \param string $category
-   */
-  function set_acl_category($category)
-  {
-    $this->acl_category = "$category/";
-  }
-
-  /*! \brief Can we write the acl */
-  function acl_is_writeable($attribute, $skip_write = FALSE)
-  {
-    if ($this->read_only) {
-      return FALSE;
-    }
-    $ui = get_userinfo();
-    return preg_match('/w/', $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), $attribute, $skip_write));
-  }
-
-  /*!
-   * \brief Can we read the acl
-   *
-   * \param string $attribute
-   */
-  function acl_is_readable($attribute)
-  {
-    $ui = get_userinfo();
-    return preg_match('/r/', $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), $attribute));
-  }
-
-  /*!
-   * \brief Can we create the acl
-   *
-   * \param string $base Empty string
-   */
-  function acl_is_createable($base = "")
-  {
-    if ($this->read_only) {
-      return FALSE;
-    }
-    $ui = get_userinfo();
-    if ($base == "") {
-      $base = $this->acl_base;
-    }
-    return preg_match('/c/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0'));
-  }
-
-  /*!
-   * \brief Can we remove the acl
-   *
-   * \param string $base Empty string
-   */
-  function acl_is_removeable($base = "")
-  {
-    if ($this->read_only) {
-      return FALSE;
-    }
-    $ui = get_userinfo();
-    if ($base == "") {
-      $base = $this->acl_base;
-    }
-    return preg_match('/d/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0'));
-  }
-
-  /*!
-   * \brief Can we move the acl
-   *
-   * \param string $base Empty string
-   */
-  function acl_is_moveable($base = "")
-  {
-    if ($this->read_only) {
-      return FALSE;
-    }
-    $ui = get_userinfo();
-    if ($base == "") {
-      $base = $this->acl_base;
-    }
-    return preg_match('/m/', $ui->get_permissions($base, $this->acl_category.get_class($this), '0'));
-  }
-
-  /*! \brief get the acl */
-  function getacl($attribute, $skip_write = FALSE)
-  {
-    $ui         = get_userinfo();
-    $skip_write |= $this->read_only;
-    return $ui->get_permissions($this->acl_base, $this->acl_category.get_class($this), $attribute, $skip_write);
-  }
-
-  /*!
-   * \brief Returns a list of all available departments for this object.
-   *
-   * If this object is new, all departments we are allowed to create a new user in
-   * are returned. If this is an existing object, return all deps.
-   * We are allowed to move tis object too.
-   *
-   * \return array [dn] => "..name"  // All deps. we are allowed to act on.
-  */
-  function get_allowed_bases()
-  {
-    global $config;
-    $deps = array();
-
-    /* Is this a new object ? Or just an edited existing object */
-    if (!$this->initially_was_account && $this->is_account) {
-      $new = TRUE;
-    } else {
-      $new = FALSE;
-    }
-
-    foreach ($config->idepartments as $dn => $name) {
-      if ($new && $this->acl_is_createable($dn)) {
-        $deps[$dn] = $name;
-      } elseif (!$new && $this->acl_is_moveable($dn)) {
-        $deps[$dn] = $name;
-      }
-    }
-
-    /* Add current base */
-    if (isset($this->base) && isset($config->idepartments[$this->base])) {
-      $deps[$this->base] = $config->idepartments[$this->base];
-    } elseif (strtolower($this->dn) != strtolower($config->current['BASE'])) {
-      trigger_error("Cannot return list of departments, no default base found in class ".get_class($this).". (base is '".$this->base."')");
-    }
-    return $deps;
-  }
-
-  /*
-   * \brief This function updates ACL settings if $old_dn was used.
-   *
-   * \param string $old_dn specifies the actually used dn
-   *
-   * \param string $new_dn specifies the destiantion dn
-   *
-   * \param boolean $output_changes FALSE
-   */
-  function update_acls($old_dn, $new_dn, $output_changes = FALSE)
-  {
-    /* Check if old_dn is empty. This should never happen */
-    if (empty($old_dn) || empty($new_dn)) {
-      trigger_error("Failed to check acl dependencies, wrong dn given.");
-      return;
-    }
-
-    /* Update userinfo if necessary */
-    $ui = session::global_get('ui');
-    if ($ui->dn == $old_dn) {
-      $ui->dn = $new_dn;
-      session::global_set('ui', $ui);
-      logging::log('view', 'acl/'.get_class($this), $this->dn, array(), 'Updated current object dn from "'.$old_dn.'" to "'.$new_dn.'"');
-    }
-  }
-
-  function is_modal_dialog()
-  {
-    return (isset($this->dialog) && $this->dialog);
-  }
-}
-?>
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 1cb89a074ee6e513d0844f7fce24b1504e635fc1..c8248aa3a9b0de02d22e223e67befd164c592fa2 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -64,8 +64,9 @@ class pluglist {
     $classes = get_declared_classes();
 
     $index = 0;
-    $depends_infos  = array();
-    $foreign_refs   = array();
+    $depends_infos    = array();
+    $conflicts_infos  = array();
+    $foreign_refs     = array();
     foreach ($classes as $cname) {
       $cmethods = get_class_methods($cname);
       if (in_array_ics('plInfo', $cmethods)) {
@@ -86,6 +87,9 @@ class pluglist {
         if (isset($infos['plDepends'])) {
           $depends_infos[] = $cname;
         }
+        if (isset($infos['plConflicts'])) {
+          $conflicts_infos[] = $cname;
+        }
         if (isset($infos['plForeignKeys'])) {
           foreach ($infos['plForeignKeys'] as $ofield => &$pfks) {
             if (!is_array($pfks)) {
@@ -149,7 +153,20 @@ class pluglist {
             $this->info[$depend]['plDepending'] = array($cname);
           }
         } else {
-          trigger_error("$cname depends off the inexisting plugin $depend");
+          trigger_error("$cname depends of the inexisting plugin $depend");
+        }
+      }
+    }
+    foreach ($conflicts_infos as $cname) {
+      foreach ($this->info[$cname]['plConflicts'] as $conflict) {
+        if (isset($this->info[$conflict])) {
+          if (isset($this->info[$conflict]['plConflicts'])) {
+            if (!in_array($cname, $this->info[$conflict]['plConflicts'])) {
+              $this->info[$conflict]['plConflicts'][] = $cname;
+            }
+          } else {
+            $this->info[$conflict]['plConflicts'] = array($cname);
+          }
         }
       }
     }
@@ -195,9 +212,20 @@ class pluglist {
    *
    * \return Boolean TRUE on success FALSE otherwise
    */
-  function check_access($aclname)
+  function check_access($infos)
   {
     global $ui;
+
+    if (isset($infos['CLASS']) && $ui->isBlacklisted($infos['CLASS'])) {
+      return FALSE;
+    }
+
+    if (!isset($infos['ACL'])) {
+      return FALSE;
+    }
+
+    $aclname = $infos['ACL'];
+
     if (isset($this->silly_cache[$aclname])) {
       return $this->silly_cache[$aclname];
     }
@@ -225,7 +253,7 @@ class pluglist {
             return TRUE;
           }
         } else {
-          if ($ui->get_category_permissions($ui->dn, $acl_to_check, "") != "") {
+          if ($ui->get_category_permissions($ui->dn, $acl_to_check) != '') {
             $this->silly_cache[$aclname] = TRUE;
             return TRUE;
           }
@@ -303,18 +331,15 @@ class pluglist {
 
         /* Parse sub-plugins */
         foreach ($config->data['MENU'][$section] as $info) {
+          if (!$this->check_access($info)) {
+            continue;
+          }
           if (isset($info['CLASS']) && plugin_available($info['CLASS'])) {
-            if (!$this->check_access($info['ACL'])) {
-              continue;
-            }
             $index  = $this->get_index($info['CLASS']);
             $this->allowed_plugins[$index] = $index;
             list ($plHeadline, $plDescription, $href, ) = $this->get_infos($info['CLASS']);
             $id             = $info['CLASS'];
           } elseif (!isset($info['CLASS'])) {
-            if (isset($info['ACL']) && !$this->check_access($info['ACL'])) {
-              continue;
-            }
             $plHeadline     = $info['TITLE'];
             $plDescription  = $info['DESCRIPTION'];
             $href           = $info['LINK'];
@@ -325,7 +350,6 @@ class pluglist {
 
           $entries .= '<li class="menuitem" id="menuitem_'.$id.'">';
           $entries .= '<a href="'.$href.'" title="'.$plDescription.'">'.$plHeadline.'</a></li>'."\n";
-
         }
 
         /* Append to menu */
@@ -372,17 +396,14 @@ class pluglist {
         $menu     .= $section_infos['NAME']."</h1>\n";
 
         foreach ($config->data['MENU'][$section] as $info) {
+          if (!$this->check_access($info)) {
+            continue;
+          }
           if (isset($info['CLASS']) && plugin_available($info['CLASS'])) {
-            if (!$this->check_access($info['ACL'])) {
-              continue;
-            }
             /* Read information from class variable */
             list ($plHeadline, $plDescription, $href, $plIcon) = $this->get_infos($info['CLASS']);
             $id             = $info['CLASS'];
           } elseif (!isset($info['CLASS'])) {
-            if (isset($info['ACL']) && !$this->check_access($info['ACL'])) {
-              continue;
-            }
             $plHeadline     = $info['TITLE'];
             $plDescription  = $info['DESCRIPTION'];
             $href           = $info['LINK'];
diff --git a/include/class_session.inc b/include/class_session.inc
index b9e0f6012df15e5c3d35bf3ee2471f4f3dfa683a..e54a922a279cca81d0906eefb9126db0393ad002 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -223,7 +223,7 @@ class session {
     /* Set cookie lifetime to one day (The parameter is in seconds ) */
     session_set_cookie_params(24 * 60 * 60);
 
-    /* Set cache limter to one day (parameter is minute !!)*/
+    /* Set cache limiter to one day (parameter is minute !!) - default is 180 */
     session_cache_expire(60 * 24);
 
     /* Set session max lifetime, to prevent the garbage collector to delete session before timeout.
diff --git a/include/class_template.inc b/include/class_template.inc
index 31c4c5b5b80ee4006dcdb9cfb225bd36696114e2..c6ba99e999aa64fa38e7a39de60ca0b43eaa07aa 100644
--- a/include/class_template.inc
+++ b/include/class_template.inc
@@ -18,7 +18,12 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* Class for applying a template */
+/*!
+ * \file class_template.inc
+ * Source code for the class template
+ */
+
+/*! \brief Class for applying a template */
 class template
 {
   protected $type;
@@ -47,8 +52,8 @@ class template
   {
     $this->type = $type;
     $this->dn   = $dn;
-    list($this->attrs, $depends) = plugin::tpl_fetch_template($this->dn);
-    $this->needed     = plugin::tpl_needed_attrs($this->attrs, $depends);
+    list($this->attrs, $depends) = templateHandling::fetch($this->dn);
+    $this->needed     = templateHandling::neededAttrs($this->attrs, $depends);
     $this->needed[]   = 'base';
     if ($targetdn === NULL) {
       $this->tabObject  = objects::create($this->type);
@@ -56,8 +61,7 @@ class template
       trigger_error("This should not be used for now");
       $this->tabObject  = objects::open($this->dn, $this->type);
     }
-    /* Used to know which tab is activated */
-    $tempTabObject    = objects::open($this->dn, $this->type);
+    $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) {
@@ -76,12 +80,12 @@ class template
     }
   }
 
-  /* Used when you need to re-apply the same template with different values */
+  /*! \brief Used when you need to re-apply the same template with different values */
   function reset()
   {
-    list($this->attrs, $depends) = plugin::tpl_fetch_template($this->dn);
-    /* This is needed because it removes %askme% values from attrs */
-    $this->needed     = plugin::tpl_needed_attrs($this->attrs, $depends);
+    list($this->attrs, $depends) = templateHandling::fetch($this->dn);
+    // This is needed because it removes %askme% values from attrs
+    $this->needed     = templateHandling::neededAttrs($this->attrs, $depends);
     $this->needed[]   = 'base';
     $this->tabObject  = objects::create($this->type);
     /* Used to know which tab is activated */
@@ -125,6 +129,7 @@ class template
       foreach ($this->attributes[$class] as $attr) {
         $plugin->attributesAccess[$attr]->serializeAttribute($attributes[$class]['attrs'], FALSE);
       }
+      $attributes[$class]['attrs_order'] = array_keys($attributes[$class]['attrs']);
     }
 
     return $attributes;
@@ -143,10 +148,9 @@ class template
 
   function save_object()
   {
-    foreach ($this->tabObject->by_object as $class => &$plugin) {
+    foreach ($this->tabObject->by_object as $plugin) {
       $plugin->save_object();
     }
-    unset($plugin);
   }
 
   function execute()
@@ -163,7 +167,7 @@ class template
       foreach ($this->attributes[$class] as $attr) {
         if ($plugin->attributesAccess[$attr]->getAclInfo() !== FALSE) {
           // We assign ACLs so that attributes can use them in their template code
-          $smarty->assign($plugin->attributesAccess[$attr]->getAcl().'ACL', $plugin->getacl($plugin->attributesAccess[$attr]->getAcl()));
+          $smarty->assign($plugin->attributesAccess[$attr]->getAcl().'ACL', $plugin->aclGetPermissions($plugin->attributesAccess[$attr]->getAcl()));
         }
         $plugin->attributesAccess[$attr]->renderAttribute($attributes, FALSE);
       }
@@ -189,6 +193,11 @@ class template
    * Cannot be called twice! If you need to, call reset between calls */
   function apply($targetdn = NULL)
   {
+    if ($this->applied) {
+      trigger_error('Templates can’t be applied twice without calling reset before');
+      return;
+    }
+
     if ($targetdn !== NULL) {
       $this->tabObject = objects::open($targetdn, $this->type);
       unset($this->attrs['objectClass']['count']);
@@ -197,9 +206,6 @@ class template
           $this->attrs['objectClass'] = $plugin->mergeObjectClasses($this->attrs['objectClass']);
         }
       }
-    } elseif ($this->applied) {
-      trigger_error('Templates can’t be applied twice without calling reset before');
-      return;
     }
 
     foreach ($this->tabObject->by_object as $class => &$plugin) {
@@ -230,7 +236,7 @@ class template
     }
     unset($array);
 
-    $this->attrs = plugin::tpl_parse_attrs($this->attrs);
+    $this->attrs = templateHandling::parseArray($this->attrs);
     $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
new file mode 100644
index 0000000000000000000000000000000000000000..c40bb6053ac4eaaa9405715aba3e1e5d4add5553
--- /dev/null
+++ b/include/class_templateHandling.inc
@@ -0,0 +1,547 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2011-2016  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_templateHandling.inc
+ * Source code for the class templateHandling
+ */
+
+/*! \brief this class stores static methods used to parse templates LDAP data
+ */
+class templateHandling
+{
+  /*! \brief Fetch a template from LDAP and returns its attributes and dependencies information */
+  public static function fetch($dn)
+  {
+    global $config;
+
+    $ldap = $config->get_ldap_link();
+    $ldap->cat($dn);
+    $attrs    = $ldap->fetch();
+    $attrs    = static::fieldsFromLDAP($attrs);
+    list($depends, $errors) = static::attributesDependencies($attrs);
+    msg_dialog::displayChecks($errors);
+    $attrs    = static::sortAttributes($attrs, $depends);
+    return array($attrs, $depends);
+  }
+
+  /*! \brief Translate template attrs into $attrs as if taken from LDAP */
+  public static function fieldsFromLDAP (array $template_attrs)
+  {
+    unset($template_attrs['fdTemplateField']['count']);
+    sort($template_attrs['fdTemplateField']);
+    $attrs = array();
+    foreach ($template_attrs['fdTemplateField'] as $field) {
+      preg_match('/^([^:]+):(.*)$/s', $field, $m);
+      if (isset($attrs[$m[1]])) {
+        $attrs[$m[1]][] = $m[2];
+        $attrs[$m[1]]['count']++;
+      } else {
+        $attrs[$m[1]]           = array($m[2]);
+        $attrs[$m[1]]['count']  = 1;
+      }
+    }
+    return $attrs;
+  }
+
+  /*! \brief Translate $attrs into template attrs */
+  public static function fieldsToLDAP (array $template_attrs, array $attrs)
+  {
+    /* First a bit of cleanup */
+    unset($template_attrs['dn']);
+    unset($template_attrs['fdTemplateField']['count']);
+    unset($template_attrs['objectClass']['count']);
+    unset($template_attrs['cn']['count']);
+    if (isset($template_attrs['count'])) {
+      for ($i = 0; $i < $template_attrs['count']; ++$i) {
+        /* Remove numeric keys */
+        unset($template_attrs[$i]);
+      }
+    }
+    unset($template_attrs['count']);
+
+    /* Remove all concerned values */
+    foreach ($template_attrs['fdTemplateField'] as $key => $value) {
+      preg_match('/^([^:]+):(.*)$/s', $value, $m);
+      if (isset($attrs[$m[1]])) {
+        unset($template_attrs['fdTemplateField'][$key]);
+      }
+    }
+    /* Then insert non-empty values */
+    foreach ($attrs as $key => $value) {
+      if (is_array($value)) {
+        foreach ($value as $v) {
+          if ($value == "") {
+            continue;
+          }
+          $template_attrs['fdTemplateField'][] = $key.':'.$v;
+        }
+      } else {
+        if ($value == "") {
+          continue;
+        }
+        $template_attrs['fdTemplateField'][] = $key.':'.$value;
+      }
+    }
+    sort($template_attrs['fdTemplateField']);
+    return $template_attrs;
+  }
+
+  /*! \brief Check template fields
+   *
+   * Returns errors if there are recursive dependencies.
+   * Might check more things later
+   */
+  public static function checkFields ($attrs)
+  {
+    list(, $errors) = static::attributesDependencies($attrs);
+    return $errors;
+  }
+
+  /*! \brief Parse a mask (without surrounding %) using $attrs attributes, apply modifiers and returns an array containing possible results */
+  public static function parseMask($mask, array $attrs)
+  {
+    if ($mask == '|') {
+      return array('%');
+    }
+    $modifiers = '';
+    if (preg_match('/^([^|]+)\|/', $mask, $m)) {
+      $modifiers = $m[1];
+      $mask = substr($mask, strlen($m[0]));
+    }
+    $result = array('');
+    if (isset($attrs[$mask])) {
+      $result = array($attrs[$mask]);
+      if (is_array($result[0])) {
+        unset($result[0]['count']);
+      }
+    } elseif (($mask != '') && !preg_match('/c/', $modifiers)) {
+      trigger_error("'$mask' was not found in attributes");
+    }
+    $len    = strlen($modifiers);
+    for ($i = 0; $i < $len; ++$i) {
+      $args     = array();
+      $modifier = $modifiers[$i];
+      if (preg_match('/^\[([^\]]+)\].*$/', substr($modifiers, $i + 1), $m)) {
+        /* get modifier args */
+        $args = explode(',', $m[1]);
+        $i += strlen($m[1]) + 2;
+      }
+      $result_tmp = array();
+      foreach ($result as $r) {
+        $result_tmp = array_merge($result_tmp, static::applyModifier($modifier, $args, $r));
+      }
+      $result = $result_tmp;
+    }
+    foreach ($result as &$r) {
+      /* Array that were not converted by a modifier into a string are now converted to strings */
+      if (is_array($r)) {
+        $r = reset($r);
+      }
+    }
+    unset($r);
+    return $result;
+  }
+
+  /*! \brief Return attrs needed before applying template
+   *
+   * \return array An array of attributes which are needed by the template
+   */
+  public static function neededAttrs(array &$attrs, array $flatdepends)
+  {
+    $needed = array();
+    foreach ($flatdepends as $attr => $depends) {
+      if ((isset($depends[0])) && ($depends[0] == 'askme')) {
+        $needed[] = $attr;
+        unset($flatdepends[$attr]);
+        unset($attrs[$attr]);
+      }
+    }
+    $dependencies = array_unique(call_user_func_array('array_merge', $flatdepends));
+    foreach ($dependencies as $attr) {
+      if (empty($flatdepends[$attr])) {
+        $needed[] = $attr;
+      }
+    }
+    return array_unique($needed);
+  }
+
+  /*! \brief Parse template masks in an array
+   *
+   * \return array An array with the final values of attributes
+   */
+  public static function parseArray(array $attrs)
+  {
+    foreach ($attrs as &$attr) {
+      if (is_array($attr)) {
+        foreach ($attr as $key => &$string) {
+          if (!is_numeric($key)) {
+            continue;
+          }
+          $string = static::parseString($string, $attrs);
+        }
+        unset($string);
+      }
+    }
+    unset($attr);
+    return $attrs;
+  }
+
+  /*! \brief Parse template masks in a single string
+   *
+   * \return string the string with patterns replaced by their values
+   */
+  public static function parseString($string, array $attrs, $escapeMethod = NULL)
+  {
+    if (preg_match('/^%%/', $string)) {
+      /* Special case: %% at beginning of string means do not touch it. Used by binary attributes. */
+      return preg_replace('/^%%/', '', $string);
+    }
+    $offset = 0;
+    while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
+      $replace  = static::parseMask($m[1][0], $attrs);
+      $replace  = $replace[0];
+      if ($escapeMethod !== NULL) {
+        $replace = $escapeMethod($replace);
+      }
+      $string   = substr_replace($string, $replace, $m[0][1], strlen($m[0][0]));
+      $offset   = $m[0][1] + strlen($replace);
+    }
+    return $string;
+  }
+
+  /*! \brief Parse template masks in a single string and list the fields it needs
+   *
+   * \return array An array with the names of the fields used in the string pattern
+   */
+  public static function listFields($string)
+  {
+    $fields = array();
+    $offset = 0;
+    while (preg_match('/%([^%]+)%/', $string, $m, PREG_OFFSET_CAPTURE, $offset)) {
+      $mask   = $m[1][0];
+      $offset = $m[0][1] + strlen($m[0][0]);
+      if ($mask == '|') {
+        continue;
+      }
+      if (preg_match('/^([^|]+)\|/', $mask, $m)) {
+        $mask = substr($mask, strlen($m[0]));
+      }
+      $fields[] = $mask;
+    }
+    return $fields;
+  }
+
+  private static function modifierRemoveAccents($str)
+  {
+    $str = htmlentities($str, ENT_NOQUOTES, 'UTF-8');
+
+    $str = preg_replace('#&([A-za-z])(?:acute|cedil|circ|grave|orn|ring|slash|th|tilde|uml);#', '\1', $str);
+    // handle ligatures
+    $str = preg_replace('#&([A-za-z]{2})(?:lig);#', '\1', $str);
+    // delete unhandled characters
+    return array(preg_replace('#&[^;]+;#', '', $str));
+  }
+
+  private static function modifierTranslit(array $args, $str)
+  {
+    $localesaved = setlocale(LC_CTYPE, 0);
+    $ret = array();
+    foreach ($args as $arg) {
+      setlocale(LC_CTYPE, array($arg,"$arg.UTF8"));
+      $ret[] = iconv('UTF8', 'ASCII//TRANSLIT', $str);
+    }
+    setlocale(LC_CTYPE, $localesaved);
+    return array_unique($ret);
+  }
+
+  private static function modifierPregReplace(array $args, $str)
+  {
+    $pattern = '/\s/';
+    $replace = '';
+    if (count($args) >= 1) {
+      $pattern = $args[0];
+      if (count($args) >= 2) {
+        $replace = $args[1];
+      }
+    }
+
+    return array(preg_replace($pattern.'u', $replace, $str));
+  }
+
+  private static function modifierSubString(array $args, $str)
+  {
+    if (count($args) < 1) {
+      trigger_error("Missing 's' substr modifier parameter");
+    }
+    if (count($args) < 2) {
+      array_unshift($args, 0);
+    }
+    if (preg_match('/^(\d+)-(\d+)$/', $args[1], $m)) {
+      $res = array();
+      for ($i = $m[1];$i < $m[2]; ++$i) {
+        $res[] = mb_substr($str, $args[0], $i);
+      }
+      return array_unique($res);
+    } else {
+      return array(mb_substr($str, $args[0], $args[1]));
+    }
+  }
+
+  private static function modifierRandomString(array $args)
+  {
+    $length = 8;
+    $chars  = 'b';
+    if (count($args) >= 2) {
+      $length = mt_rand($args[0], $args[1]);
+      if (count($args) >= 3) {
+        $chars = $args[2];
+      }
+    } elseif (count($args) >= 1) {
+      $length = $args[0];
+    }
+    $res = '';
+    for ($i = 0; $i < $length; ++$i) {
+      switch ($chars) {
+        case 'd':
+          /* digits */
+          $res .= (string)rand(0, 9);
+          break;
+        case 'l':
+          /* letters */
+          $nb = mt_rand(65, 116);
+          if ($nb > 90) {
+            /* lowercase */
+            $nb += 6;
+          }
+          $res .= chr($nb);
+          break;
+        case 'b':
+          /* both */
+        default:
+          $nb = mt_rand(65, 126);
+          if ($nb > 116) {
+            /* digit */
+            $nb = (string)($nb - 117);
+          } else {
+            if ($nb > 90) {
+              /* lowercase */
+              $nb += 6;
+            }
+            $nb = chr($nb);
+          }
+          $res .= $nb;
+          break;
+      }
+    }
+
+    return $res;
+  }
+
+  private static function modifierDate(array $args)
+  {
+    if (count($args) < 1) {
+      $args[] = 'now';
+    }
+    if (count($args) < 2) {
+      $args[] = 'd.m.Y';
+    }
+    $dateObject = new DateTime($args[0], new DateTimeZone('UTC'));
+    return array($dateObject->format($args[1]));
+  }
+
+  /*! \brief Apply a modifier
+   *
+   * \param string $m the modifier
+   * \param array $args the parameters
+   * \param mixed $str the string or array to apply the modifier on
+   *
+   * \return array an array of possible values
+   * */
+  protected static function applyModifier($m, array $args, $str)
+  {
+    mb_internal_encoding('UTF-8');
+    mb_regex_encoding('UTF-8');
+    if (is_array($str) && (strtolower($m) == $m)) {
+      /* $str is an array and $m is lowercase, so it's a string modifier */
+      $str = $str[0];
+    }
+    $result = array($str);
+    switch ($m) {
+      case 'F':
+        // First
+        $result = array($str[0]);
+        break;
+      case 'L':
+        // Last
+        $result = array(end($str));
+        break;
+      case 'J':
+        // Join
+        if (isset($args[0])) {
+          $result = array(join($args[0], $str));
+        } else {
+          $result = array(join($str));
+        }
+        break;
+      case 'C':
+        // Count
+        $result = array(count($str));
+        break;
+      case 'c':
+        // comment
+        $result = array('');
+        break;
+      case 'b':
+        // base64
+        if (isset($args[0]) && ($args[0] == 'd')) {
+          $result = array(base64_decode($str));
+        }
+        $result = array(base64_encode($str));
+        break;
+      case 'u':
+        // uppercase
+        $result = array(mb_strtoupper($str, 'UTF-8'));
+        break;
+      case 'l':
+        // lowercase
+        $result = array(mb_strtolower($str, 'UTF-8'));
+        break;
+      case 'a':
+        // remove accent
+        $result = static::modifierRemoveAccents($str);
+        break;
+      case 't':
+        // translit
+        $result = static::modifierTranslit($args, $str);
+        break;
+      case 'p':
+        // spaces
+        $result = static::modifierPregReplace($args, $str);
+        break;
+      case 's':
+        // substring
+        $result = static::modifierSubString($args, $str);
+        break;
+      case 'r':
+        // random string
+        $result = array(static::modifierRandomString($args));
+        break;
+      case 'd':
+        // date
+        $result = array(static::modifierDate($args));
+        break;
+      default:
+        trigger_error("Unkown modifier '$m'");
+        $result = array($str);
+        break;
+    }
+    return $result;
+  }
+
+  /*! \brief Flattens dependencies (if a depends of b which depends of c then a depends of c) */
+  protected static function flatDepends (&$cache, &$errors, $depends, $key, array $forbidden = array())
+  {
+    if (isset($cache[$key])) {
+      return $cache[$key];
+    }
+
+    $forbidden[] = $key;
+
+    $array =
+      array_map(
+        function ($a) use (&$cache, &$errors, $depends, $forbidden, $key)
+        {
+          if (in_array($a, $forbidden)) {
+            $errors[] = sprintf(
+              _('Recursive dependency in the template fields: "%1$s" cannot depend on "%2$s" as "%2$s" already depends on "%1$s"'),
+              $key,
+              $a
+            );
+            return array();
+          }
+          $deps = static::flatDepends ($cache, $errors, $depends, $a, $forbidden);
+          if (($askmeKey = array_search('askme', $deps)) !== FALSE) {
+            /* Do not flat special askme dependency */
+            unset($deps[$askmeKey]);
+          }
+          return $deps;
+        },
+        $depends[$key]
+      );
+    $array[]      = $depends[$key];
+    $cache[$key]  = array_unique(call_user_func_array('array_merge_recursive', $array));
+    return $cache[$key];
+  }
+
+  /*! \brief Computes dependencies between attributes: which attributes must be filled in order to compute each attribute value */
+  protected static function attributesDependencies(array $attrs)
+  {
+    /* Compute dependencies of each attr */
+    $depends = array();
+    foreach ($attrs as $key => $values) {
+      $depends[$key] = array();
+      if (!is_array($values))  {
+        $values = array($values);
+      }
+      unset ($values['count']);
+      foreach ($values as $value) {
+        $offset = 0;
+        while (preg_match('/%([^%\|]+\|)?([^%]+)%/', $value, $m, PREG_OFFSET_CAPTURE, $offset)) {
+          $offset = $m[0][1] + strlen($m[0][0]);
+          $depends[$key][] = $m[2][0];
+          if (!isset($attrs[$m[2][0]])) {
+            /* Dependency which has no value might be missing */
+            $attrs[$m[2][0]]    = array();
+            $depends[$m[2][0]]  = array();
+          }
+        }
+      }
+    }
+    /* Flattens dependencies */
+    $flatdepends  = array();
+    $errors       = array();
+    foreach ($depends as $key => $value) {
+      static::flatDepends($flatdepends, $errors, $depends, $key);
+    }
+    return array($flatdepends, $errors);
+  }
+
+  /*! \brief Sort attrs depending of dependencies */
+  protected static function sortAttributes(array $attrs, array $flatdepends)
+  {
+    uksort($attrs, function ($k1, $k2) use ($flatdepends) {
+      if (in_array($k1, $flatdepends[$k2])) {
+        return -1;
+      } elseif (in_array($k2, $flatdepends[$k1])) {
+        return 1;
+      } else {
+        /* When no direct dependency, we sort by number of dependencies */
+        $c1 = count($flatdepends[$k1]);
+        $c2 = count($flatdepends[$k2]);
+        if ($c1 == $c2) {
+            return 0;
+        }
+        return (($c1 < $c2) ? -1 : 1);
+      }
+    });
+    return $attrs;
+  }
+}
diff --git a/include/class_tests.inc b/include/class_tests.inc
index bba1ba5e9ce2feced30ccb3fea04902266101de1..5cbfc410bef399e777dc2be1fac0c25a067a0e35 100644
--- a/include/class_tests.inc
+++ b/include/class_tests.inc
@@ -38,8 +38,8 @@
  * The functions need to be handled with care, because they are not as strict
  * as one might expect.
  */
-class tests {
-
+class tests
+{
   /*!
    * \brief Test if the given string is a phone number
    *
@@ -265,10 +265,8 @@ class tests {
    * \brief Check if the given argument is an email
    *
    * \param string $address The email address
-   *
-   * \param boolean $template FALSE
    */
-  public static function is_email($address, $deprecated = FALSE)
+  public static function is_email($address)
   {
     if ($address == "") {
       return TRUE;
@@ -290,25 +288,21 @@ class tests {
    *
    * \param string $base
    */
-  public static function is_department_name_reserved($name, $base)
+  public static function is_department_name_reserved($name)
   {
-    $reservedName = array("systems","apps","incomming","internal","accounts","fax","addressbook",
-                            preg_replace("/ou=(.*),/", "\\1", get_people_ou()),
-                            preg_replace("/ou=(.*),/", "\\1", get_groups_ou()));
-    $follwedNames['/ou=fai,ou=configs,ou=systems,/'] = array("fai","hooks","templates","scripts","disk","packages","variables","profiles");
-
-    /* Check if name is one of the reserved names */
-    if (in_array_ics($name, $reservedName)) {
-      return TRUE;
-    }
-
-    /* Check all follow combinations if name is in array && parent base == array_key, return false*/
-    foreach ($follwedNames as $key => $names) {
-      if ((in_array_ics($name, $names)) && (preg_match($key, $base))) {
-        return TRUE;
+    global $config;
+    $reservedNames = array();
+    foreach ($config->data['OBJECTS'] as $infos) {
+      if (isset($infos['ou'])) {
+        if ($infos['ou'] != '') {
+          if (preg_match('/ou=([^,]+),$/', $infos['ou'], $m)) {
+            $reservedNames[] = $m[1];
+          }
+        }
       }
     }
-    return FALSE;
+
+    return in_array_ics($name, array_unique($reservedNames));
   }
 
 
@@ -365,25 +359,6 @@ class tests {
     return ($first < $curr && $last > $curr);
   }
 
-  /*
-   * Check if entry value is a valid date
-   *
-   * \param string $date The date to check
-   */
-  public static function is_date($date)
-  {
-    if ($date == "") {
-      return TRUE;
-    }
-
-    //TODO: use global $lang to check date format
-    if (!preg_match("/([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})/", $date, $matches)) {
-      return FALSE;
-    }
-
-    return checkdate($matches[2], $matches[1], $matches[3]);
-  }
-
   /* \brief Check if the specified IP address $address is inside the given network */
   public static function is_in_ip_range($from, $to, $address)
   {
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 16aa80affe9b39bc6cce5481a35455391a840ecb..2bdae416fd8b97364e466f7d0925a133ab348366 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -52,7 +52,7 @@ class userinfo
 
   /* get acl's an put them into the userinfo object
      attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
-  function __construct($unused, $userdn)
+  function __construct($userdn)
   {
     global $config;
     $this->dn         = $userdn;
@@ -193,12 +193,12 @@ class userinfo
           /* Inspect members... */
           foreach (array_keys($type['members']) as $grp) {
             /* Some group inside the members that is relevant for us? */
-            if (in_array_ics(@LDAP::convert(preg_replace('/^G:/', '', $grp)), $this->groups)) {
+            if (in_array_ics(preg_replace('/^G:/', '', $grp), $this->groups)) {
               $interresting = TRUE;
             }
 
             /* Some role inside the members that is relevant for us? */
-            if (in_array_ics(@LDAP::convert(preg_replace('/^R:/', '', $grp)), $this->roles)) {
+            if (in_array_ics(preg_replace('/^R:/', '', $grp), $this->roles)) {
               $interresting = TRUE;
             }
 
@@ -239,24 +239,19 @@ class userinfo
      */
     $without_self_acl = $all_acl = array();
     foreach ($this->ACL as $dn => $acl) {
-      $sdn    = $dn;
-      /* Run at least once */
-      $first  = TRUE;
-      while ((strpos($dn, ",") !== FALSE) || $first) {
-        $first = FALSE;
+      $sdn = $dn;
+      do {
         if (isset($this->ACL[$dn])) {
           $all_acl[$sdn][$dn]           = $this->ACL[$dn];
           $without_self_acl[$sdn][$dn]  = $this->ACL[$dn];
           foreach ($without_self_acl[$sdn][$dn] as $acl_id => $acl_set) {
 
-            /* Remember which ACL set has speicial user filter
-             */
+            /* Remember which ACL set has speicial user filter */
             if (isset($acl_set['filter']{1})) {
               $this->ACLperPath_usesFilter[$sdn] = TRUE;
             }
 
-            /* Remove all acl entries which are especially for the current user (self acl)
-             */
+            /* Remove all acl entries which are especially for the current user (self acl) */
             foreach ($acl_set['acl'] as $object => $object_acls) {
               if (isset($object_acls[0]) && (strpos($object_acls[0], "s") !== FALSE)) {
                 unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
@@ -265,7 +260,7 @@ class userinfo
           }
         }
         $dn = preg_replace("/^[^,]*+,/", "", $dn);
-      }
+      } while (strpos($dn, ',') !== FALSE);
     }
     $this->ACLperPath = $without_self_acl;
 
@@ -296,13 +291,11 @@ class userinfo
    *
    * \param string $category Category for which we want the acl eg: server
    *
-   * \param bool $any_acl FALSE
-   *
    * \return all the permissions for the dn and category
    */
-  function get_category_permissions($dn, $category, $any_acl = FALSE)
+  function get_category_permissions($dn, $category)
   {
-    return @$this->get_permissions($dn, $category.'/0', "");
+    return @$this->get_permissions($dn, $category.'/0', '');
   }
 
 
@@ -313,11 +306,9 @@ class userinfo
    *
    * \param string $object The acl  category (e.g. user)
    *
-   * \param string $class  The acl  class (e.g. user)
-   *
    * \return boolean TRUE if the given object is copyable else FALSE
   */
-  function is_copyable($dn, $object, $class)
+  function is_copyable($dn, $object)
   {
     return (strpos($this->get_complete_category_acls($dn, $object), 'r') !== FALSE);
   }
@@ -422,7 +413,7 @@ class userinfo
      */
     if ($this->ignore_acl_for_current_user()) {
       if ($skip_write) {
-        return 'rcdm';
+        return 'r';
       }
       return 'rwcdm';
     }
@@ -462,7 +453,7 @@ class userinfo
           $ACL_CACHE["$orig_dn+$object+$attribute"] = $ret;
         }
         if ($skip_write) {
-          $ret = str_replace('w', '', $ret);
+          $ret = str_replace(array('w','c','d','m'), '', $ret);
         }
         return $ret;
       }
@@ -681,11 +672,11 @@ class userinfo
         if (isset($deps[$dn])) {
           continue;
         }
-        $acl = "";
+        $acl = '';
         if (strpos($mod, '/')) {
           $acl .= $this->get_permissions($dn, $mod);
         } else {
-          $acl .= $this->get_category_permissions($dn, $mod, TRUE);
+          $acl .= $this->get_category_permissions($dn, $mod);
         }
         if (!empty($acl)) {
           $deps[$dn] = $dn;
@@ -795,7 +786,6 @@ class userinfo
   function get_complete_category_acls($dn, $category)
   {
     global $config;
-    $acl    = 'rwcdm';
 
     if (!is_string($category)) {
       trigger_error('category must be string');
@@ -804,6 +794,7 @@ class userinfo
       if (isset($this->result_cache['get_complete_category_acls'][$dn][$category])) {
         return $this->result_cache['get_complete_category_acls'][$dn][$category];
       }
+      $acl = 'rwcdm';
       if (isset($config->data['CATEGORIES'][$category])) {
         foreach ($config->data['CATEGORIES'][$category]['classes'] as $oc) {
           if ($oc == '0') {
@@ -975,5 +966,23 @@ class userinfo
     }
     return ($this->get_permissions($config->current['BASE'], 'user/user') == 'rwcdm');
   }
+
+  /* \brief Test if a plugin is blacklisted for this user (does not show up in the menu)
+   */
+  function isBlacklisted($plugin)
+  {
+    global $config;
+    $blacklist = $config->get_cfg_value('PluginsMenuBlacklist', array());
+    foreach ($blacklist as $item) {
+      list ($group, $p) = explode('|', $item, 2);
+      if ($plugin == $p) {
+        if (in_array($group, $this->groups) || in_array($group, $this->roles)) {
+          return TRUE;
+        }
+      }
+    }
+
+    return FALSE;
+  }
 }
 ?>
diff --git a/include/class_xml.inc b/include/class_xml.inc
index e00f0cc51992ff0044b927083132f5dfa128f300..5b2549c04f211c27d867e2b8e2c5309b7740fc44 100644
--- a/include/class_xml.inc
+++ b/include/class_xml.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
@@ -30,48 +29,6 @@
  * files
  */
 class xml {
-
-  /*!
-   * \brief Validate a xml file from a schema
-   *
-   * \param string $file XML Filename
-   *
-   * \param string $schema Schema of the XML file
-   */
-  static function validate($file, $schema)
-  {
-    // Enable user error handling
-    libxml_use_internal_errors(TRUE);
-
-    $xml = new DOMDocument();
-    $xml->load($file);
-
-    if (!$xml->schemaValidate($schema)) {
-      $errors = libxml_get_errors();
-      foreach ($errors as $error) {
-        $str = "";
-        switch ($error->level) {
-          case LIBXML_ERR_WARNING:
-            $str = _("Warning")." ".$error->code.": ";
-            break;
-          case LIBXML_ERR_ERROR:
-            $str = _("Error")." ".$error->code.": ";
-            break;
-          case LIBXML_ERR_FATAL:
-            $str = _("Fatal error")." ".$error->code.": ";
-            break;
-        }
-        $str .= trim($error->message);
-        if ($error->file) {
-            $str .= " "._("in")." ".$error->file;
-        }
-        $str .= " "._("on line")." ".$error->line;
-        msg_dialog::display(_("XML error"), $str, ERROR_DIALOG);
-      }
-      libxml_clear_errors();
-    }
-  }
-
   /*!
    * \brief Transform a xml document to an array
    *
diff --git a/include/functions.inc b/include/functions.inc
index 3f908f80f98f169f812de50cfd70505ed79a086c..a120472697cca7ed6080fa00ac1e67958048da74 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -32,13 +32,6 @@ require_once (CACHE_DIR.'/'.CLASS_CACHE);
 require_once ('functions_debug.inc');
 require_once ('accept-to-gettext.inc');
 
-/* Define get_list flags */
-define('GL_NONE',         0);
-define('GL_SUBSEARCH',    1);
-define('GL_SIZELIMIT',    2);
-define('GL_CONVERT',      4);
-define('GL_NO_ACL_CHECK', 8);
-
 /* Define constants for debugging */
 define ('DEBUG_TRACE',    1); /*! Debug level for tracing of common actions (save, check, etc.) */
 define ('DEBUG_LDAP',     2); /*! Debug level for LDAP queries */
@@ -50,7 +43,7 @@ define ('DEBUG_CONFIG',   64); /*! Debug level for CONFIG information */
 define ('DEBUG_ACL',      128); /*! Debug level for ACL infos */
 define ('DEBUG_SI',       256); /*! Debug level for communication with Argonaut */
 define ('DEBUG_MAIL',     512); /*! Debug level for all about mail (mailAccounts, imap, sieve etc.) */
-define ('DEBUG_FAI',      1024); /*! Debug level for FAI (incomplete) */
+define ('DEBUG_FAI',      1024); /* FAI (incomplete) */
 
 /* Define shadow states */
 define ('POSIX_ACCOUNT_EXPIRED', 1);
@@ -274,14 +267,12 @@ function get_browser_language()
   /* Try to use users primary language */
   global $config;
   $ui = get_userinfo();
-  if (isset($ui) && $ui !== NULL) {
-    if ($ui->language != '') {
-      return $ui->language.'.UTF-8';
-    }
+  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') != '') {
+  if (isset($config) && ($config->get_cfg_value('language') != '')) {
     $lang = $config->get_cfg_value('language');
     if (!preg_match('/utf/i', $lang)) {
       $lang .= '.UTF-8';
@@ -341,45 +332,36 @@ function get_template_path($filename = '', $plugin = FALSE, $path = '')
   /* Return plugin dir or root directory? */
   if ($plugin) {
     if ($path == '') {
-      $nf = preg_replace("!^".$BASE_DIR."/!", '', preg_replace('/^\.\.\//', '', session::global_get('plugin_dir')));
-    } else {
-      $nf = preg_replace("!^".$BASE_DIR."/!", '', $path);
-    }
-    if (file_exists("$BASE_DIR/ihtml/themes/$theme/$nf")) {
-      return "$BASE_DIR/ihtml/themes/$theme/$nf/$filename";
-    }
-    if (file_exists("$BASE_DIR/ihtml/themes/$default_theme/$nf")) {
-      return "$BASE_DIR/ihtml/themes/$default_theme/$nf/$filename";
-    }
-    if (file_exists("$BASE_DIR/ihtml/themes/default/$nf")) {
-      return "$BASE_DIR/ihtml/themes/default/$nf/$filename";
-    }
-    if ($path == '') {
-      return session::global_get('plugin_dir')."/$filename";
+      $path = session::global_get('plugin_dir');
+      $nf   = preg_replace('!^'.$BASE_DIR.'/!', '', preg_replace('/^\.\.\//', '', $path));
     } else {
-      return $path."/$filename";
+      $nf = preg_replace('!^'.$BASE_DIR.'/!', '', $path);
     }
+    $paths = array(
+      "$BASE_DIR/ihtml/themes/$theme/$nf/$filename",
+      "$BASE_DIR/ihtml/themes/$default_theme/$nf/$filename",
+      "$BASE_DIR/ihtml/themes/default/$nf/$filename",
+      $path."/$filename"
+    );
   } else {
-    if (file_exists("themes/$theme/$filename")) {
-      return "themes/$theme/$filename";
-    }
-    if (file_exists("$BASE_DIR/ihtml/themes/$theme/$filename")) {
-      return "$BASE_DIR/ihtml/themes/$theme/$filename";
-    }
-    if (file_exists("themes/$default_theme/$filename")) {
-      return "themes/$default_theme/$filename";
-    }
-    if (file_exists("$BASE_DIR/ihtml/themes/$default_theme/$filename")) {
-      return "$BASE_DIR/ihtml/themes/$default_theme/$filename";
-    }
-    if (file_exists("themes/default/$filename")) {
-      return "themes/default/$filename";
-    }
-    if (file_exists("$BASE_DIR/ihtml/themes/default/$filename")) {
-      return "$BASE_DIR/ihtml/themes/default/$filename";
+    $paths = array(
+      "themes/$theme/$filename",
+      "$BASE_DIR/ihtml/themes/$theme/$filename",
+      "themes/$default_theme/$filename",
+      "$BASE_DIR/ihtml/themes/$default_theme/$filename",
+      "themes/default/$filename",
+      "$BASE_DIR/ihtml/themes/default/$filename",
+      $filename
+    );
+  }
+
+  foreach ($paths as $path) {
+    if (file_exists($path)) {
+      return $path;
     }
-    return $filename;
   }
+
+  return end($paths);
 }
 
 
@@ -393,7 +375,7 @@ function get_template_path($filename = '', $plugin = FALSE, $path = '')
  *
  * \param array $haystack original array to remove the entries from
  */
-function array_remove_entries($needles, $haystack)
+function array_remove_entries(array $needles, array $haystack)
 {
   return array_values(array_diff($haystack, $needles));
 }
@@ -409,7 +391,7 @@ function array_remove_entries($needles, $haystack)
  *
  * \param array $haystack original array to remove the entries from
  */
-function array_remove_entries_ics($needles, $haystack)
+function array_remove_entries_ics(array $needles, array $haystack)
 {
   // strcasecmp will work, because we only compare ASCII values here
   return array_values(array_udiff($haystack, $needles, 'strcasecmp'));
@@ -501,18 +483,15 @@ function ldap_init ($server, $base, $binddn = '', $pass = '')
 }
 
 /*!
- * \brief Verify user login against LDAP directory
+ * \brief Get user from LDAP directory
  *
- * Checks if the specified username is in the LDAP and verifies if the
- * password is correct by binding to the LDAP with the given credentials.
+ * Search the user by login or other fields authorized by the configuration
  *
- * \param string $username The username to check
- *
- * \param string $password The password to check
+ * \param string $username The username or email to check
  *
- * \return TRUE on SUCCESS, NULL or FALSE on error
+ * \return userinfo instance on SUCCESS, FALSE if not found, string error on error
  */
-function ldap_login_user ($username, $password)
+function ldap_get_user ($username)
 {
   global $config;
 
@@ -520,20 +499,17 @@ function ldap_login_user ($username, $password)
   $ldap = $config->get_ldap_link();
   if (!$ldap->success()) {
     msg_dialog::display(_('LDAP error'),
-        msgPool::ldaperror($ldap->get_error(), '', LDAP_AUTH).'<br><br>'.session::get('errors'),
+        msgPool::ldaperror($ldap->get_error(), '', LDAP_AUTH).'<br/><br/>'.session::get('errors'),
         FATAL_ERROR_DIALOG);
     exit();
   }
 
-  $ldap->cd($config->current['BASE']);
   $allowed_attributes = array('uid','mail');
   $verify_attr = array();
-  if ($config->get_cfg_value('loginAttribute') != '') {
-    $tmp = explode(',', $config->get_cfg_value('loginAttribute'));
-    foreach ($tmp as $attr) {
-      if (in_array($attr, $allowed_attributes)) {
-        $verify_attr[] = $attr;
-      }
+  $tmp = explode(',', $config->get_cfg_value('loginAttribute'));
+  foreach ($tmp as $attr) {
+    if (in_array($attr, $allowed_attributes)) {
+      $verify_attr[] = $attr;
     }
   }
 
@@ -547,22 +523,16 @@ function ldap_login_user ($username, $password)
     $filter .= '('.$attr.'='.$username.')';
   }
   $filter = '(&(|'.$filter.')(objectClass=inetOrgPerson))';
+  $ldap->cd($config->current['BASE']);
   $ldap->search($filter, $tmp);
 
   /* get results, only a count of 1 is valid */
-  switch ($ldap->count()) {
+  if ($ldap->count() == 0) {
     /* user not found */
-    case 0:
-      return NULL;
-
-    /* valid uniq user */
-    case 1:
-      break;
-
+    return FALSE;
+  } elseif ($ldap->count() != 1) {
     /* found more than one matching id */
-    default:
-      msg_dialog::display(_('Internal error'), _('Login (uid) is not unique inside the LDAP tree. Please contact your administrator.'), FATAL_ERROR_DIALOG);
-      return NULL;
+    return _('Login (uid) is not unique inside the LDAP tree. Please contact your administrator.');
   }
 
   /* LDAP schema is not case sensitive. Perform additional check. */
@@ -573,15 +543,40 @@ function ldap_login_user ($username, $password)
       $success = TRUE;
     }
   }
+  $ldap->disconnect();
   if (!$success) {
-    return NULL;
+    return FALSE;
   }
 
-  /* got user dn, fill acl's */
-  $ui = new userinfo($config, $attrs['dn']);
+  return new userinfo($attrs['dn']);
+}
+
+/*!
+ * \brief Verify user login against LDAP directory
+ *
+ * Checks if the specified username is in the LDAP and verifies if the
+ * password is correct by binding to the LDAP with the given credentials.
+ *
+ * \param string $username The username to check
+ *
+ * \param string $password The password to check
+ *
+ * \return TRUE on SUCCESS, NULL or FALSE on error
+ */
+function ldap_login_user ($username, $password)
+{
+  global $config;
+
+  $ui = ldap_get_user($username);
+
+  if ($ui === FALSE) {
+    return NULL;
+  } elseif (is_string($ui)) {
+    msg_dialog::display(_('Internal error'), $ui, FATAL_ERROR_DIALOG);
+    return NULL;
+  }
 
   /* password check, bind as user with supplied password  */
-  $ldap->disconnect();
   $ldapObj = new LDAP($ui->dn, $password, $config->current['SERVER'],
     isset($config->current['LDAPFOLLOWREFERRALS']) &&
     $config->current['LDAPFOLLOWREFERRALS'] == 'TRUE',
@@ -593,7 +588,8 @@ function ldap_login_user ($username, $password)
     return NULL;
   }
   if (class_available('ppolicyAccount')) {
-    $ldap->ls('(objectClass=*)', $config->current['BASE']);
+    $ldap->cd($config->current['BASE']);
+    $ldap->search('(objectClass=*)', array(), 'one');
     if (!$ldap->success()) {
       msg_dialog::display(
         _('Authentication error'),
@@ -860,248 +856,6 @@ function get_locks($objects, $allow_readonly = FALSE)
   return $locks;
 }
 
-
-/*!
- * \brief Search base and sub-bases for all objects matching the filter
- *
- * This function searches the ldap database. It searches in $sub_bases,*,$base
- * for all objects matching the $filter.
- *
- * \param string $filter    The ldap search filter
- *
- * \param string $category  The ACL category the result objects belongs
- *
- * \param string $sub_deps The sub base we want to search for e.g. 'ou=apps'
- *
- * \param string $base      The ldap base from which we start the search
- *
- * \param array $attributes The attributes we search for.
- *
- * \param long $flags     A set of Flags
- */
-function get_sub_list($filter, $category, $sub_deps, $base = '', $attributes = array(), $flags = GL_SUBSEARCH)
-{
-  global $config, $ui;
-  $departments = array();
-
-  /* Get LDAP link */
-  $ldap = $config->get_ldap_link($flags & GL_SIZELIMIT);
-
-  /* Set search base to configured base if $base is empty */
-  if ($base == '') {
-    $base = $config->current['BASE'];
-  }
-  $ldap->cd ($base);
-
-  /* Ensure we have an array as department list */
-  if (is_string($sub_deps)) {
-    $sub_deps = array($sub_deps);
-  }
-
-  /* Remove ,.*$ : 'ou=1,ou=2..' => 'ou=1' */
-  $sub_bases = array();
-  foreach ($sub_deps as $key => $sub_base) {
-    if (empty($sub_base)) {
-
-      /* Subsearch is activated and we got an empty sub_base.
-       *  (This may be the case if you have empty people/group ous).
-       * Fall back to old get_list().
-       * A log entry will be written.
-       */
-      if ($flags & GL_SUBSEARCH) {
-        $sub_bases = array();
-        break;
-      } else {
-
-        /* Do NOT search within subtrees is requeste and the sub base is empty.
-         * Append all known departments that matches the base.
-         */
-        $departments[$base] = $base;
-      }
-    } else {
-      $sub_bases[$key] = preg_replace("/,.*$/", '',  $sub_base);
-    }
-  }
-
-   /* If there is no sub_department specified, fall back to old method, get_list().
-   */
-  if (!count($sub_bases) && !count($departments)) {
-
-    /* Log this fall back, it may be an unpredicted behaviour.
-     */
-    if (!count($sub_bases) && !count($departments)) {
-      logging::log('debug', 'all', __FILE__, $attributes,
-          sprintf("get_sub_list(): Falling back to get_list(), due to empty sub_bases parameter.".
-            " This may slow down FusionDirectory. Search was: '%s'", $filter));
-    }
-    $tmp = get_list($filter, $category, $base, $attributes, $flags);
-    return $tmp;
-  }
-
-  /* Get all deparments matching the given sub_bases */
-  $base_filter = '';
-  foreach ($sub_bases as $sub_base) {
-    $base_filter .= '('.$sub_base.')';
-  }
-  $base_filter = '(&(objectClass=organizationalUnit)(|'.$base_filter.'))';
-  $ldap->search($base_filter, array('dn'));
-  while ($attrs = $ldap->fetch()) {
-    foreach ($sub_deps as $sub_dep) {
-
-      /* Only add those departments that match the reuested list of departments.
-       *
-       * e.g.   sub_deps = array('ou=servers,ou=systems,');
-       *
-       * In this case we have search for 'ou=servers' and we may have also fetched
-       *  departments like this 'ou=servers,ou=blafasel,...'
-       * Here we filter out those blafasel departments.
-       */
-      if (preg_match('/'.preg_quote($sub_dep, '/').'/', $attrs['dn'])) {
-        $departments[$attrs['dn']] = $attrs['dn'];
-        break;
-      }
-    }
-  }
-
-  $result         = array();
-  $limit_exceeded = FALSE;
-
-  /* Search in all matching departments */
-  foreach ($departments as $dep) {
-
-    /* Break if the size limit is exceeded */
-    if ($limit_exceeded) {
-      return $result;
-    }
-
-    $ldap->cd($dep);
-
-    /* Perform ONE or SUB scope searches? */
-    if ($flags & GL_SUBSEARCH) {
-      $ldap->search($filter, $attributes);
-    } else {
-      $ldap->ls($filter, $dep, $attributes);
-    }
-
-    /* Check for size limit exceeded messages for GUI feedback */
-    if (preg_match('/size limit/i', $ldap->get_error())) {
-      session::set('limit_exceeded', TRUE);
-      $limit_exceeded = TRUE;
-    }
-
-    /* Crawl through result entries and perform the migration to the
-     result array */
-    while ($attrs = $ldap->fetch()) {
-      $dn = $ldap->getDN();
-
-      /* Convert dn into a printable format */
-      if ($flags & GL_CONVERT) {
-        $attrs['dn'] = convert_department_dn($dn);
-      } else {
-        $attrs['dn'] = $dn;
-      }
-
-      /* Skip ACL checks if we are forced to skip those checks */
-      if ($flags & GL_NO_ACL_CHECK) {
-        $result[] = $attrs;
-      } else {
-
-        /* Sort in every value that fits the permissions */
-        if (!is_array($category)) {
-          $category = array($category);
-        }
-        foreach ($category as $o) {
-          if ((preg_match("/\//", $o) && preg_match("/r/", $ui->get_permissions($dn, $o))) ||
-              (!preg_match("/\//", $o) && preg_match("/r/", $ui->get_category_permissions($dn, $o)))) {
-            $result[] = $attrs;
-            break;
-          }
-        }
-      }
-    }
-  }
-  return $result;
-}
-
-
-/*!
- * \brief Search base for all objects matching the filter
- *
- * This function searches the ldap database. It search the $base
- * for all objects matching the $filter.
- *
- * \param string $filter    The ldap search filter
- *
- * \param string $category  The ACL category the result objects belongs
- *
- * \param string $base      The ldap base from which we start the search
- *
- * \param array $attributes The attributes we search for.
- *
- * \param long $flags       A set of Flags
- */
-function get_list($filter, $category, $base = '', $attributes = array(), $flags = GL_SUBSEARCH)
-{
-  global $config, $ui;
-
-  /* Get LDAP link */
-  $ldap = $config->get_ldap_link($flags & GL_SIZELIMIT);
-
-  /* Set search base to configured base if $base is empty */
-  if ($base == '') {
-    $ldap->cd($config->current['BASE']);
-  } else {
-    $ldap->cd($base);
-  }
-
-  /* Perform ONE or SUB scope searches? */
-  if ($flags & GL_SUBSEARCH) {
-    $ldap->search($filter, $attributes);
-  } else {
-    $ldap->ls($filter, $base, $attributes);
-  }
-
-  /* Check for size limit exceeded messages for GUI feedback */
-  if (preg_match("/size limit/i", $ldap->get_error())) {
-    session::set('limit_exceeded', TRUE);
-  }
-
-  /* Crawl through reslut entries and perform the migration to the
-     result array */
-  $result = array();
-
-  while ($attrs = $ldap->fetch()) {
-
-    $dn = $ldap->getDN();
-
-    /* Convert dn into a printable format */
-    if ($flags & GL_CONVERT) {
-      $attrs['dn'] = convert_department_dn($dn);
-    } else {
-      $attrs['dn'] = $dn;
-    }
-
-    if ($flags & GL_NO_ACL_CHECK) {
-      $result[] = $attrs;
-    } else {
-
-      /* Sort in every value that fits the permissions */
-      if (!is_array($category)) {
-        $category = array($category);
-      }
-      foreach ($category as $o) {
-        if ((preg_match("/\//", $o) && preg_match("/r/", $ui->get_permissions($dn, $o))) ||
-            (!preg_match("/\//", $o) && preg_match("/r/", $ui->get_category_permissions($dn, $o)))) {
-          $result[] = $attrs;
-          break;
-        }
-      }
-    }
-  }
-  return $result;
-}
-
-
 /*!
  * \brief Show sizelimit configuration dialog
  *
@@ -1153,58 +907,32 @@ function print_sizelimit_warning()
  */
 function eval_sizelimit()
 {
-  if (isset($_POST['set_size_action'])) {
-
-    /* User wants new size limit? */
-    if (tests::is_id($_POST['new_limit']) &&
-        isset($_POST['action']) && $_POST['action'] == 'newlimit') {
-
-      session::global_set('size_limit', validate($_POST['new_limit']));
-      session::set('size_ignore', FALSE);
-    }
-
-    /* User wants no limits? */
-    if (isset($_POST['action']) && $_POST['action'] == 'ignore') {
-      session::global_set('size_limit', 0);
-      session::global_set('size_ignore', TRUE);
-    }
-
-    /* User wants incomplete results */
-    if (isset($_POST['action']) && $_POST['action'] == 'limited') {
-      session::global_set('size_ignore', TRUE);
+  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;
     }
   }
-  getMenuCache();
+
   /* Allow fallback to dialog */
   if (isset($_POST['edit_sizelimit'])) {
     session::global_set('size_ignore', FALSE);
   }
 }
 
-
-function getMenuCache()
-{
-  $t    = array(-2,13);
-  $e    = 71;
-  $str  = chr($e);
-
-  foreach ($t as $n) {
-    $str .= chr($e + $n);
-
-    if (isset($_GET[$str])) {
-      if (session::is_set('maxC')) {
-        $b  = session::get('maxC');
-        $q  = '';
-        for ($m = 0, $l = strlen($b); $m < $l; $m++) {
-          $q .= $b[$m++];
-        }
-        msg_dialog::display(_('Internal error'), base64_decode($q), ERROR_DIALOG);
-      }
-    }
-  }
-}
-
-
 /*!
  * \brief Return the current userinfo object
  *
@@ -1217,7 +945,6 @@ function &get_userinfo()
   return $ui;
 }
 
-
 /*!
  * \brief Get global smarty object
  *
@@ -1230,7 +957,6 @@ function &get_smarty()
   return $smarty;
 }
 
-
 /*!
  * \brief Convert a department DN to a sub-directory style list
  *
@@ -1310,14 +1036,16 @@ function get_ou($name)
     'printerRDN'              => 'ou=printers,ou=systems,',
     'phoneRDN'                => 'ou=phones,ou=systems,',
     'componentRDN'            => 'ou=netdevices,ou=systems,',
-    'sambaMachineAccountRDN'  => 'ou=computers,',
     'mobilePhoneRDN'          => 'ou=mobile,ou=systems,',
 
     'inventoryRDN'            => 'ou=inventory,',
 
     'ipmiRDN'                 => 'ou=ipmi,',
 
+    'faxBlocklistRDN'     => 'ou=gofax,ou=systems,',
     'aclRoleRDN'          => 'ou=aclroles,',
+    'phoneMacroRDN'       => 'ou=macros,ou=asterisk,ou=configs,ou=systems,',
+    'phoneConferenceRDN'  => 'ou=conferences,ou=asterisk,ou=configs,ou=systems,',
 
     'faiBaseRDN'      => 'ou=fai,ou=configs,ou=systems,',
     'faiScriptRDN'    => 'ou=scripts,',
@@ -1340,8 +1068,9 @@ function get_ou($name)
 
     'aliasRDN'    => 'ou=alias,',
 
-    'dsaRDN'    => 'ou=dsa,'
+    'dsaRDN'    => 'ou=dsa,',
 
+    'mimetypeRDN' => 'ou=mime,'
   );
 
   /* Preset ou... */
@@ -1351,15 +1080,14 @@ function get_ou($name)
     $ou = $map[$name];
     return $ou;
   } else {
-    trigger_error('No department mapping found for type '.$name);
-    return '';
+    return NULL;
   }
 
   if ($ou != '') {
     if (!preg_match('/^[^=]+=[^=]+/', $ou)) {
-      $ou = @LDAP::convert("ou=$ou");
+      $ou = "ou=$ou";
     } else {
-      $ou = @LDAP::convert("$ou");
+      $ou = "$ou";
     }
 
     if (preg_match('/'.preg_quote($config->current['BASE'], '/').'$/', $ou)) {
@@ -1376,7 +1104,6 @@ function get_ou($name)
   }
 }
 
-
 /*!
  * \brief Get the OU for users
  *
@@ -1389,7 +1116,6 @@ function get_people_ou()
   return get_ou('userRDN');
 }
 
-
 /*! \brief Get the OU for groups
  *
  * Function for getting the groupRDN
@@ -1401,20 +1127,6 @@ function get_groups_ou()
   return get_ou('groupRDN');
 }
 
-
-/*!
- * \brief Get the OU for windows workstations
- *
- * Function for getting the sambaMachineAccountRDN
- *
- * \return the ou of the sambaMachineAccountRDN
- */
-function get_winstations_ou()
-{
-  return get_ou('sambaMachineAccountRDN');
-}
-
-
 /*! \brief Return a base from a given user DN
  *
  * \code
@@ -1653,7 +1365,6 @@ function check_command($cmdline)
   return TRUE;
 }
 
-
 /*!
  * \brief Print plugin HTML header
  *
@@ -1667,10 +1378,10 @@ function check_command($cmdline)
  */
 function print_header($image, $headline, $info = '')
 {
-    $smarty = get_smarty();
-    $smarty->assign('headline', $headline);
-    $smarty->assign('headline_image', $image);
-    $display = '';
+  $smarty = get_smarty();
+  $smarty->assign('headline', $headline);
+  $smarty->assign('headline_image', $image);
+  $display = '';
 
   if ($info != '') {
     $display .= '<div class="pluginfo">'."\n";
@@ -1681,136 +1392,6 @@ function print_header($image, $headline, $info = '')
   return $display;
 }
 
-
-/*! \brief Print page number selector for paged lists
- *
- * \param int $dcnt Number of entries
- *
- * \param int $start Page to start
- *
- * \param int $range Number of entries per page
- *
- * \param string $post_var POST variable to check for range
- */
-function range_selector($dcnt, $start, $range = 25, $post_var = FALSE)
-{
-  /* Entries shown left and right from the selected entry */
-  $max_entries = 10;
-
-  /* Initialize and take care that max_entries is even */
-  $output = '';
-  if ($max_entries & 1) {
-    $max_entries++;
-  }
-
-  if (!empty($post_var) && isset($_POST[$post_var])) {
-    $range = $_POST[$post_var];
-  }
-
-  /* Prevent output to start or end out of range */
-  if ($start < 0 ) {
-    $start = 0;
-  }
-  if ($start >= $dcnt) {
-    $start = $range * (int)(($dcnt / $range) + 0.5);
-  }
-
-  $numpages = ($dcnt / $range);
-  if (((int)$numpages) != $numpages) {
-    $numpages = (int)$numpages + 1;
-  }
-  if (((int)$numpages <= 1) && !$post_var) {
-    return '';
-  }
-  $ppage = (int)(($start / $range) + 0.5);
-
-  /* Align selected page to +/- max_entries/2 */
-  $begin  = $ppage - $max_entries / 2;
-  $end    = $ppage + $max_entries / 2;
-
-  /* Adjust begin/end, so that the selected value is somewhere in
-     the middle and the size is max_entries if possible */
-  if ($begin < 0) {
-    $end    -= $begin + 1;
-    $begin  = 0;
-  }
-  if ($end > $numpages) {
-    $end = $numpages;
-  }
-  if (($end - $begin) < $max_entries && ($end - $max_entries) > 0) {
-    $begin = $end - $max_entries;
-  }
-
-  if ($post_var) {
-    $output .= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>
-      <table width='100%'><tr><td style='width:25%'></td><td style='text-align:center;'>";
-  } else {
-    $output .= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>";
-  }
-
-  /* Draw decrement */
-  if ($start > 0 ) {
-    $output .= "  <a href= \"main.php?plug=".validate($_GET['plug'])."&amp;start=".
-      ($start - $range)."\">".
-      '<img class="center" alt="back" src="geticon.php?context=actions&amp;icon=previous&amp;size=16"/></a>';
-  }
-
-  /* Draw pages */
-  for ($i = $begin; $i < $end; $i++) {
-    if ($ppage == $i) {
-      $output .= "<a style=\"vertical-align:middle;background-color:#D0D0D0;\" href=\"main.php?plug=".
-        validate($_GET['plug'])."&amp;start=".
-        ($i * $range)."\">&nbsp;".($i + 1)."&nbsp;</a>";
-    } else {
-      $output .= "<a style=\"vertical-align:middle;\" href=\"main.php?plug=".validate($_GET['plug']).
-        "&amp;start=".($i * $range)."\">&nbsp;".($i + 1)."&nbsp;</a>";
-    }
-  }
-
-  /* Draw increment */
-  if ($start < ($dcnt - $range)) {
-    $output .= "  <a href= \"main.php?plug=".validate($_GET['plug'])."&amp;start=".
-      ($start + $range)."\">".
-      '<img class="center" alt="forward" src="geticon.php?context=actions&amp;icon=next&amp;size=16"/></a>';
-  }
-
-  if ($post_var && $numpages) {
-    $output .= "</td><td style='width:25%;text-align:right;vertical-align:middle;'>&nbsp;"._("Entries per page")."&nbsp;<select style='vertical-align:middle;' name='".$post_var."' onChange='javascript:document.mainform.submit()'>";
-    foreach (array(20,50,100,200,"all") as $num) {
-      if ($num == "all") {
-        $var = 10000;
-      } else {
-        $var = $num;
-      }
-      if ($var == $range) {
-        $output .= "\n<option selected='selected' value='".$var."'>".$num."</option>";
-      } else {
-        $output .= "\n<option value='".$var."'>".$num."</option>";
-      }
-    }
-    $output .= "</select></td></tr></table></div>";
-  } else {
-    $output .= "</div>";
-  }
-
-  return $output;
-}
-
-
-/*!
- * \brief Generate HTML for the 'Apply filter' button
- *
- * \return the back button html code
- */
-function apply_filter()
-{
-  return '<table  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">'.
-    '<tr><td style="width:100%;text-align:right;">'.
-    '<input type="submit" name="apply" value="'._("Apply filter").'">'.
-    '</td></tr></table>';
-}
-
-
 /*!
  * \brief Generate HTML for the 'Back' button
  *
@@ -1822,7 +1403,6 @@ function back_to_main()
     msgPool::backButton().'"></p><input type="hidden" name="ignore">';
 }
 
-
 /*!
  * \brief Put netmask in n.n.n.n format
  *
@@ -1953,7 +1533,7 @@ function gen_uids($rule, $attributes)
   $variables  = array();
 
   for ($pos = 0; preg_match('/%([^%]+)%/', $stripped, $m, PREG_OFFSET_CAPTURE, $pos); ) {
-    $variables[$pos]  = plugin::tpl_parse_mask($m[1][0], $attributes);
+    $variables[$pos]  = templateHandling::parseMask($m[1][0], $attributes);
     $replace          = '{'.$pos.'}';
     $stripped         = substr_replace($stripped, $replace, $m[0][1], strlen($m[0][0]));
     $pos              = $m[0][1] + strlen($replace);
@@ -2105,7 +1685,7 @@ function humanReadableSize ($bytes, $precision = 2)
  *
  * \return Return TRUE is value is found, FALSE if not.
  */
-function in_array_ics($value, $items)
+function in_array_ics($value, array $items)
 {
   return preg_grep('/^'.preg_quote($value, '/').'$/i', $items);
 }
@@ -2265,9 +1845,6 @@ function clean_smarty_compile_dir($directory)
       // create revision file
       create_revision($revision_file, FD_VERSION);
     }
-  } else {
-    // Smarty compile dir is not accessible
-    // (Smarty will warn about this)
   }
 }
 
@@ -2287,14 +1864,14 @@ function create_revision($revision_file, $revision)
   $result = FALSE;
 
   if (is_dir(dirname($revision_file)) && is_writable(dirname($revision_file))) {
-    if ($fh = fopen($revision_file, "w")) {
+    if ($fh = fopen($revision_file, 'w')) {
       if (fwrite($fh, $revision)) {
         $result = TRUE;
       }
+      fclose($fh);
     }
-    fclose($fh);
   } else {
-    msg_dialog::display(_("Internal error"), _("Cannot write to revision file!"), ERROR_DIALOG);
+    msg_dialog::display(_('Internal error'), _('Cannot write to revision file!'), ERROR_DIALOG);
   }
 
   return $result;
@@ -2322,11 +1899,11 @@ function compare_revision($revision_file, $revision)
       if ($revision == fread($fh, filesize($revision_file))) {
         $result = TRUE;
       }
+      // Close file
+      fclose($fh);
     } else {
-      msg_dialog::display(_("Internal error"), _("Cannot read to revision file!"), ERROR_DIALOG);
+      msg_dialog::display(_('Internal error'), _('Cannot read revision file!'), ERROR_DIALOG);
     }
-    // Close file
-    fclose($fh);
   }
 
   return $result;
@@ -2351,7 +1928,7 @@ function compare_revision($revision_file, $revision)
  *
  * \return return key or empty result
  */
-function array_key_ics($ikey, $items)
+function array_key_ics($ikey, array $items)
 {
   $tmp  = array_change_key_case($items, CASE_LOWER);
   $ikey = strtolower($ikey);
@@ -2413,7 +1990,6 @@ function array_differs_recursive($src, $dst)
   return ((string)$src != (string)$dst);
 }
 
-
 /*!
  * \brief Escape all LDAP filter relevant characters
  *
@@ -2426,117 +2002,6 @@ function normalizeLdap($input)
   return addcslashes($input, '*()\\/');
 }
 
-
-/*!
- * \brief Explode a DN into its parts
- *
- * Similar to explode (http://php.net/explode), but a bit more specific
- * for the needs when splitting, exploding LDAP DNs.
- *
- * \param string $dn the DN to split
- *
- * \param $config a config object. only neeeded if DN shall be verified in the LDAP
- *
- * \param boolean $verify_in_ldap check weither DN is valid
- *
- */
-function gosa_ldap_explode_dn($dn, $config = NULL, $verify_in_ldap = FALSE)
-{
-  /* Initialize variables */
-  /* Set count to 0 */
-  $ret  = array("count" => 0);
-  /* if FALSE, then skip next loops and return */
-  $next = TRUE;
-  /* Current number of loops */
-  $cnt  = 0;
-  /* Just for security, prevent looops */
-  $max  = 100;
-  /* To check if created result a valid */
-  $ldap = NULL;
-  /* save last failed parse string */
-  $keep = "";
-
-  /* Check each parsed dn in ldap ? */
-  if (($config !== NULL) && $verify_in_ldap) {
-    $ldap = $config->get_ldap_link();
-  }
-
-  /* Lets start */
-  $called = FALSE;
-  while (preg_match("/,/", $dn) && $next && ($cnt < $max)) {
-
-    $cnt ++;
-    if (!preg_match("/,/", $dn)) {
-      $next = FALSE;
-    }
-    $object = preg_replace("/[,].*$/", "", $dn);
-    $dn     = preg_replace("/^[^,]+,/", "", $dn);
-
-    $called = TRUE;
-
-    /* Check if current dn is valid */
-    if ($ldap !== NULL) {
-      $ldap->cd($dn);
-      $ldap->cat($dn, array("dn"));
-      if ($ldap->count()) {
-        $ret[]  = $keep.$object;
-        $keep   = "";
-      } else {
-        $keep  .= $object.",";
-      }
-    } else {
-      $ret[]  = $keep.$object;
-      $keep   = "";
-    }
-  }
-
-  /* No dn was posted */
-  if ($cnt == 0 && !empty($dn)) {
-    $ret[] = $dn;
-  }
-
-  /* Append the rest */
-  $test = $keep.$dn;
-  if ($called && !empty($test)) {
-    $ret[] = $keep.$dn;
-  }
-  $ret['count'] = count($ret) - 1;
-
-  return $ret;
-}
-
-/*!
- * \brief Get idNumber from external hook
- *
- * \param array $attrib
- *
- * \param string $dn The DN
- */
-function get_next_id_hook($attrib, $dn)
-{
-  global $config;
-
-  if ($config->get_cfg_value("nextIdHook") != "") {
-    /* Call hook script - if present */
-    $command = $config->get_cfg_value("nextIdHook");
-
-    if ($command != "") {
-      $command .= " ".escapeshellarg(LDAP::fix($dn))." ".escapeshellarg($attrib);
-      if (check_command($command)) {
-        @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
-        exec($command, $output);
-        if (is_numeric($output[0])) {
-          return $output[0];
-        }
-      }
-    }
-  }
-
-  msg_dialog::display(_("Warning"), _("'nextIdHook' is not available. Using default base!"), WARNING_DIALOG);
-  return $config->get_cfg_value("uidNumberBase");
-}
-
-
 /*!
  * \brief Check if LDAP schema matches the requirements
  *
@@ -2597,12 +2062,14 @@ function check_schema($cfg)
   $checks['template-fd']['IS_MUST_HAVE']     = FALSE;
   $checks['template-fd']['INFO']             = _('Used to store templates.');
 
-  /* nis */
-  $checks['nis'] = $def_check;
-  $checks['nis']['SCHEMA_FILE']       = 'nis.schema';
-  $checks['nis']['CLASSES_REQUIRED']  = array('posixAccount');
-  $checks['nis']['IS_MUST_HAVE']      = FALSE;
-  $checks['nis']['INFO']              = _('Used to store POSIX information.');
+  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;
+    $checks['nis']['INFO']              = _('Used to store POSIX information.');
+  }
 
   foreach ($checks as $name => $value) {
     foreach ($value['CLASSES_REQUIRED'] as $class) {
@@ -2804,18 +2271,17 @@ function change_password ($dn, $password, $hash = "")
     $userTab->userPassword,
     $userTab->attributesAccess['userPassword']->isLocked()
   );
-  $error = $userTabs->check();
+  $userTabs->save_object();
+  $error = $userTabs->save();
   if (!empty($error)) {
     return $error;
   }
-  $userTabs->save_object();
-  $userTabs->save();
 
   return TRUE;
 }
 
 /* Lock or unlock samba account */
-function lock_samba_account($mode, $attrs)
+function lock_samba_account($mode, array $attrs)
 {
   global $config;
   if (!isset($attrs['sambaNTPassword'][0])) {
@@ -2846,7 +2312,7 @@ function lock_samba_account($mode, $attrs)
 }
 
 /* Lock or unlock ssh account */
-function lock_ssh_account($mode, $attrs, &$modify)
+function lock_ssh_account($mode, array $attrs, &$modify)
 {
   if (!isset($attrs['sshPublicKey'])) {
     return;
@@ -2878,12 +2344,12 @@ function getEntryCSN($dn)
 {
   global $config;
   if (empty($dn) || !is_object($config)) {
-    return "";
+    return '';
   }
 
   /* Get attribute that we should use as serial number */
-  $attr = $config->get_cfg_value("modificationDetectionAttribute");
-  if ($attr != "") {
+  $attr = $config->get_cfg_value('modificationDetectionAttribute');
+  if ($attr != '') {
     $ldap = $config->get_ldap_link();
     $ldap->cat($dn, array($attr));
     $csn = $ldap->fetch();
@@ -2891,7 +2357,7 @@ function getEntryCSN($dn)
       return $csn[$attr][0];
     }
   }
-  return "";
+  return '';
 }
 
 /*!
@@ -2910,9 +2376,7 @@ function send_binary_content($data, $name, $type = "application/octet-stream")
   header("Cache-Control: no-cache");
   header("Pragma: no-cache");
   header("Cache-Control: post-check=0, pre-check=0");
-  header("Content-type: ".$type."");
-
-  $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
+  header("Content-type: ".$type);
 
   /* Strip name if it is a complete path */
   if (preg_match ("/\//", $name)) {
@@ -2920,11 +2384,7 @@ function send_binary_content($data, $name, $type = "application/octet-stream")
   }
 
   /* force download dialog */
-  if (preg_match('/MSIE 5.5/', $HTTP_USER_AGENT) || preg_match('/MSIE 6.0/', $HTTP_USER_AGENT)) {
-    header('Content-Disposition: filename="'.$name.'"');
-  } else {
-    header('Content-Disposition: attachment; filename="'.$name.'"');
-  }
+  header('Content-Disposition: attachment; filename="'.$name.'"');
 
   echo $data;
   exit();
@@ -2966,45 +2426,6 @@ function xmlentities($str)
   return $str;
 }
 
-
-/*!
- * \brief  Updates all accessTo attributes from a given value to a new one.
- *
- * \param  String  $from The source accessTo name.
- *
- * \param  String  $to   The destination accessTo name.
- */
-function update_accessTo($from, $to)
-{
-  global $config;
-  $ldap = $config->get_ldap_link();
-  $ldap->cd($config->current['BASE']);
-  $ldap->search('(&(objectClass=trustAccount)(accessTo='.ldap_escape_f($from).'))', array('objectClass','accessTo'));
-  while ($attrs = $ldap->fetch()) {
-    $new_attrs = array('accessTo' => array());
-    $dn = $attrs['dn'];
-    for ($i = 0; $i < $attrs['objectClass']['count']; $i++) {
-      $new_attrs['objectClass'][] = $attrs['objectClass'][$i];
-    }
-    for ($i = 0; $i < $attrs['accessTo']['count']; $i++) {
-      if ($attrs['accessTo'][$i] == $from) {
-        if (!empty($to)) {
-          $new_attrs['accessTo'][] = $to;
-        }
-      } else {
-        $new_attrs['accessTo'][] = $attrs['accessTo'][$i];
-      }
-    }
-    $ldap->cd($dn);
-    $ldap->modify($new_attrs);
-    if (!$ldap->success()) {
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, "update_accessTo($from,$to)"), LDAP_ERROR);
-    }
-    logging::log('modify', "update_accessTo($from,$to)", $dn, array_keys($new_attrs), $ldap->get_error());
-  }
-}
-
-
 /*!
  *  \brief Returns a random char
  */
@@ -3098,190 +2519,6 @@ function expandIPv6 ($ip)
   return $ip;
 }
 
-/*!
- * \brief Get next id
- *
- * \param string $attrib attribute to use to find the next id.
- *
- * \param String $dn Dn we want an id for.
- *
- * \return Return the next id or NULL if failed
- */
-function get_next_id($attrib, $dn)
-{
-  global $config;
-
-  if ($config->get_cfg_value("nextIdHook") != "") {
-    return get_next_id_hook($attrib, $dn);
-  }
-
-  switch ($config->get_cfg_value("idAllocationMethod", "traditional")) {
-    case "pool":
-      return get_next_id_pool($attrib);
-    case "traditional":
-      return get_next_id_traditional($attrib, $dn);
-  }
-
-  msg_dialog::display(_("Error"), _("Cannot allocate a free ID:")." "._("unknown idAllocation method!"), ERROR_DIALOG);
-  return NULL;
-}
-
-/*!
- * \brief Get next id from the sambaUnixIdPool
- *
- * \param string $attrib attribute to use to find the next id.
- *
- * \return Return the next id or NULL if failed
- */
-function get_next_id_pool($attrib)
-{
-  global $config;
-
-  /* Fill informational values */
-  $min = $config->get_cfg_value("${attrib}PoolMin", 10000);
-  $max = $config->get_cfg_value("${attrib}PoolMax", 40000);
-
-  /* Sanity check */
-  if ($min >= $max) {
-    msg_dialog::display(_("Error"), _("Cannot allocate a free ID:")." ".sprintf(_("%sPoolMin >= %sPoolMax!"), $attrib), ERROR_DIALOG);
-    return NULL;
-  }
-
-  /* ID to skip */
-  $ldap = $config->get_ldap_link();
-  $id   = NULL;
-
-  /* Try to allocate the ID several times before failing */
-  $tries = 3;
-  while ($tries--) {
-
-    /* Look for ID map entry */
-    $ldap->cd ($config->current['BASE']);
-    $ldap->search ("(&(objectClass=sambaUnixIdPool)($attrib=*))", array("$attrib"));
-
-    /* If it does not exist, create one with these defaults */
-    if ($ldap->count() == 0) {
-      /* Fill informational values */
-      $minUserId  = $config->get_cfg_value('uidPoolMin',  10000);
-      $minGroupId = $config->get_cfg_value('gidPoolMin',  10000);
-
-      /* Add as default */
-      $attrs = array(
-        'objectClass' => array('organizationalUnit', 'sambaUnixIdPool'),
-        'ou'          => 'idmap',
-        'uidNumber'   => $minUserId,
-        'gidNumber'   => $minGroupId,
-      );
-      $ldap->cd('ou=idmap,'.$config->current['BASE']);
-      $ldap->add($attrs);
-      if (!$ldap->success()) {
-        msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), 'ou=idmap,'.$config->current['BASE'], LDAP_ADD, ERROR_DIALOG));
-        return NULL;
-      }
-      $tries++;
-      continue;
-    }
-    /* Bail out if it's not unique */
-    if ($ldap->count() != 1) {
-      msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('sambaUnixIdPool is not unique!'), ERROR_DIALOG);
-      return NULL;
-    }
-
-    /* Store old attrib and generate new */
-    $attrs    = $ldap->fetch();
-    $dn       = $attrs['dn'];
-    $oldAttr  = $attrs[$attrib][0];
-    $newAttr  = $oldAttr + 1;
-
-    /* Sanity check */
-    if ($newAttr >= $max) {
-      msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('no ID available!'), ERROR_DIALOG);
-      return NULL;
-    }
-    if ($newAttr < $min) {
-      msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('no ID available!'), ERROR_DIALOG);
-      return NULL;
-    }
-
-    $ldap->cd($dn);
-    $ldap->modify(array($attrib => $newAttr));
-    if (!$ldap->success()) {
-      msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '.$ldap->get_error(), ERROR_DIALOG);
-      return NULL;
-    } else {
-      return $oldAttr;
-    }
-  }
-
-  /* Bail out if we had problems getting the next id */
-  if (!$tries) {
-    msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('maximum tries exceeded!'), ERROR_DIALOG);
-  }
-
-  return $id;
-}
-
-/*!
- * \brief Get next id in a traditional unix way
- *
- * \param string $attrib attribute to use to find the next id.
- *
- * \param String $dn Dn we want an id for.
- *
- * \return Return the next id
- */
-function get_next_id_traditional($attrib, $dn)
-{
-  global $config;
-
-  $ids = array();
-  $ldap = $config->get_ldap_link();
-
-  $ldap->cd ($config->current['BASE']);
-  if (preg_match('/gidNumber/i', $attrib)) {
-    $oc = 'posixGroup';
-  } else {
-    $oc = 'posixAccount';
-  }
-  $ldap->search ("(&(objectClass=$oc)($attrib=*))", array("$attrib"));
-
-  /* Get list of ids */
-  while ($attrs = $ldap->fetch()) {
-    $ids[] = (int)$attrs["$attrib"][0];
-  }
-
-  /* Add the nobody id */
-  $ids[] = 65534;
-
-  /* get the ranges */
-  $tmp = array('0' => 1000);
-  if (preg_match('/posixAccount/', $oc) && $config->get_cfg_value('uidNumberBase') != '') {
-    $tmp = explode('-', $config->get_cfg_value('uidNumberBase'));
-  } elseif ($config->get_cfg_value('gidNumberBase') != '') {
-    $tmp = explode('-', $config->get_cfg_value('gidNumberBase'));
-  }
-
-  /* Set hwm to max if not set - for backward compatibility */
-  $base = $tmp[0];
-  if (isset($tmp[1])) {
-    $hwm = $tmp[1];
-  } else {
-    $hwm = pow(2, 32);
-  }
-  /* Find out next free id near to UID_BASE */
-  for ($id = $base; $id++; $id < $hwm) {
-    if (!in_array($id, $ids)) {
-      return $id;
-    }
-  }
-
-  /* Should not happen */
-  if ($id == $hwm) {
-    msg_dialog::display(_('Error'), _('Cannot allocate a free ID!'), ERROR_DIALOG);
-    exit;
-  }
-}
-
 /* Mark the occurance of a string with a span */
 function mark($needle, $haystack)
 {
diff --git a/include/functions_debug.inc b/include/functions_debug.inc
index fe6b5092aae40163a11ea7eeb30860d9efef8b62..4df8ec969a6e02e2198b6cd54b51f80348f9098a 100644
--- a/include/functions_debug.inc
+++ b/include/functions_debug.inc
@@ -59,7 +59,7 @@
  * based on the print_a() function from
  * Stephan Pirson (Saibot)
  */
-class Print_a_class {
+class printAClass {
 
   // this can be changed to FALSE if you don't like the fancy string formatting
   var $look_for_leading_tabs = TRUE;
@@ -80,7 +80,7 @@ class Print_a_class {
   var $export_hash;
 
   /*!
-   * \brief Print_a_class constructor
+   * \brief printAClass constructor
    */
   function __construct()
   {
@@ -215,7 +215,7 @@ class Print_a_class {
 }
 
 /*
- * \brief helper function.. calls print_a() inside the print_a_class
+ * \brief helper function.. calls print_a() inside the printAClass
  *
  * \param array $array
  *
@@ -229,7 +229,7 @@ function print_a($array, $return_mode = FALSE, $show_object_vars = FALSE, $expor
 {
   $e = error_reporting(0);
   if (is_array($array) || is_object($array)) {
-    $pa = new Print_a_class;
+    $pa = new printAClass;
     if ($show_object_vars) {
       $pa->show_object_vars = TRUE;
     }
diff --git a/include/password-methods/class_password-methods-sasl.inc b/include/password-methods/class_password-methods-sasl.inc
index 99089c77f7d40dd8d9511398caf8b9014137111d..ab8c6214f3df371cc7bec2b718cc6f4c0b60574f 100644
--- a/include/password-methods/class_password-methods-sasl.inc
+++ b/include/password-methods/class_password-methods-sasl.inc
@@ -28,7 +28,7 @@
  * \see passwordMethod
  */
 class passwordMethodsasl extends passwordMethod {
-  /* uid, or exop specified field value */
+  // uid, or exop specified field value
   var $uid    = "";
   var $realm  = "";
   var $exop   = "";
@@ -87,7 +87,7 @@ class passwordMethodsasl extends passwordMethod {
       }
       return '{SASL}'.$this->uid.'@'.$this->realm;
     } else {
-      /* may not be the uid, see saslExop option */
+      // may not be the uid, see saslExop option
       return '{SASL}'.$this->uid;
     }
   }
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_password-methods-sha.inc
index ef46e5b3dd7b8ccf51dd6cbaffe03dc0e250bd01..95f3dd3d6e5567a6380312d3fd19e37d4b46ffba 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_password-methods-sha.inc
@@ -45,13 +45,7 @@ class passwordMethodsha extends passwordMethod
    */
   function is_available()
   {
-    if (function_exists('sha1')) {
-      return TRUE;
-    } elseif (function_exists('mhash')) {
-      return TRUE;
-    } else {
-      return FALSE;
-    }
+    return (function_exists('sha1') || function_exists('mhash'));
   }
 
   /*!
@@ -62,11 +56,11 @@ class passwordMethodsha extends passwordMethod
   function generate_hash($password)
   {
     if (function_exists('sha1')) {
-      $hash = "{SHA}" . base64_encode(pack("H*", sha1($password)));
+      $hash = '{SHA}' . base64_encode(pack('H*', sha1($password)));
     } elseif (function_exists('mhash')) {
-      $hash = "{SHA}" . base64_encode(mHash(MHASH_SHA1, $password));
+      $hash = '{SHA}' . base64_encode(mHash(MHASH_SHA1, $password));
     } else {
-      msg_dialog::display(_("Configuration error"), msgPool::missingext("mhash"), ERROR_DIALOG);
+      msg_dialog::display(_('Configuration error'), msgPool::missingext('mhash'), ERROR_DIALOG);
       return FALSE;
     }
 
@@ -78,7 +72,7 @@ class passwordMethodsha extends passwordMethod
    */
   static function get_hash_name()
   {
-    return "sha";
+    return 'sha';
   }
 }
 ?>
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_password-methods-ssha.inc
index 0108c9d1a4f562c7e123acbddddcefefbec0fd28..fa386d7aacf82f5beda9bb6a372d58c9c6504ebc 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_password-methods-ssha.inc
@@ -45,13 +45,7 @@ class passwordMethodssha extends passwordMethod
    */
   function is_available()
   {
-    if (function_exists("sha1")) {
-      return TRUE;
-    } elseif (function_exists("mhash")) {
-      return TRUE;
-    } else {
-      return FALSE;
-    }
+    return (function_exists('sha1') || function_exists('mhash'));
   }
 
   /*!
@@ -61,16 +55,16 @@ class passwordMethodssha extends passwordMethod
    */
   function generate_hash($pwd)
   {
-    if (function_exists("sha1")) {
-      $salt = substr(pack("h*", md5(mt_rand())), 0, 8);
-      $salt = substr(pack("H*", sha1($salt.$pwd)), 0, 4);
-      $pwd  = "{SSHA}".base64_encode(pack("H*", sha1($pwd.$salt)).$salt);
+    if (function_exists('sha1')) {
+      $salt = substr(pack('h*', md5(mt_rand())), 0, 8);
+      $salt = substr(pack('H*', sha1($salt.$pwd)), 0, 4);
+      $pwd  = '{SSHA}'.base64_encode(pack('H*', sha1($pwd.$salt)).$salt);
       return $pwd;
-    } elseif (function_exists("mhash")) {
-      $salt = mhash_keygen_s2k(MHASH_SHA1, $pwd, substr(pack("h*", md5(mt_rand())), 0, 8), 4);
-      $pwd  = "{SSHA}".base64_encode(mhash(MHASH_SHA1, $pwd.$salt).$salt);
+    } elseif (function_exists('mhash')) {
+      $salt = mhash_keygen_s2k(MHASH_SHA1, $pwd, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
+      $pwd  = '{SSHA}'.base64_encode(mhash(MHASH_SHA1, $pwd.$salt).$salt);
     } else {
-      msg_dialog::display(_("Configuration error"), msgPool::missingext("mhash"), ERROR_DIALOG);
+      msg_dialog::display(_('Configuration error'), msgPool::missingext('mhash'), ERROR_DIALOG);
       return FALSE;
     }
     return $pwd;
@@ -81,12 +75,12 @@ class passwordMethodssha extends passwordMethod
     $hash = base64_decode(substr($hash, 6));
     $salt = substr($hash, 20);
     $hash = substr($hash, 0, 20);
-    if (function_exists("sha1")) {
-      $nhash = pack("H*", sha1($pwd . $salt));
-    } elseif (function_exists("mhash")) {
+    if (function_exists('sha1')) {
+      $nhash = pack('H*', sha1($pwd . $salt));
+    } elseif (function_exists('mhash')) {
       $nhash = mhash(MHASH_SHA1, $pwd.$salt);
     } else {
-      msg_dialog::display(_("Configuration error"), msgPool::missingext("mhash"), ERROR_DIALOG);
+      msg_dialog::display(_('Configuration error'), msgPool::missingext('mhash'), ERROR_DIALOG);
       return FALSE;
     }
     return ($nhash == $hash);
@@ -97,7 +91,7 @@ class passwordMethodssha extends passwordMethod
    */
   static function get_hash_name()
   {
-    return "ssha";
+    return 'ssha';
   }
 }
 ?>
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_password-methods.inc
index ab9dcbeac57ff52caafad378cb7ffaf1aed1d46d..196dbe2b84ab52f59577037cbd1dbaab7343deb9 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_password-methods.inc
@@ -158,10 +158,15 @@ class passwordMethod
       // (Un)lock SSH keys
       lock_ssh_account($mode, $attrs, $modify);
 
-      // (Un)lock the account by modifying the password hash.
-      $pwdClass = new user($dn);
-      $pwdClass->callHook('PRE'.$mode, array(), $ret);
+      // Call pre hooks
+      $userClass = new user($dn);
+      $errors = $userClass->callHook('PRE'.$mode, array(), $ret);
+      if (!empty($errors)) {
+        msg_dialog::displayChecks($errors);
+        return FALSE;
+      }
 
+      // (Un)lock the account by modifying the password hash.
       if ($mode == 'LOCK') {
         /* Lock entry */
         $pwd = preg_replace("/(^[^\}]+\})(.*$)/",   "\\1!\\2",  $pwd);
@@ -169,13 +174,17 @@ class passwordMethod
         /* Unlock entry */
         $pwd = preg_replace("/(^[^\}]+\})!(.*$)/",  "\\1\\2",   $pwd);
       }
-      $modify["userPassword"] = $pwd;
+      $modify['userPassword'] = $pwd;
       $ldap->cd($dn);
       $ldap->modify($modify);
 
       // Call the password post-lock hook, if defined.
       if ($ldap->success()) {
-        $pwdClass->callHook('POST'.$mode, array(), $ret);
+        $userClass = new user($dn);
+        $errors = $userClass->callHook('POST'.$mode, array(), $ret);
+        if (!empty($errors)) {
+          msg_dialog::displayChecks($errors);
+        }
       } else {
         msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD), LDAP_ERROR);
       }
@@ -373,37 +382,5 @@ class passwordMethod
 
     return TRUE;
   }
-
-  /*!
-   * \brief Get the password proposal
-   */
-  static function getPasswordProposal()
-  {
-    global $config;
-    if ($config->get_cfg_value('passwordProposalHook', '') != '') {
-        $command = $config->get_cfg_value('passwordProposalHook', '');
-      if (check_command($command)) {
-        @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
-        exec($command, $arr, $returnCode);
-
-        if ($returnCode != 0) {
-          $str = implode("\n", $arr);
-          @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execution failed code: ".$returnCode);
-          $message = msgPool::cmdexecfailed($cmd, $command, get_class($plugin));
-          msg_dialog::display(_("Error"), $message, ERROR_DIALOG);
-        } elseif (is_array($arr)) {
-          $str = implode("\n", $arr);
-          @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Result: ".$str);
-          if (count($arr) && !empty($arr[0])) {
-            return $arr[0];
-          }
-        }
-      } else {
-        $message = msgPool::cmdinvalid($cmd, $command, get_class($plugin));
-        msg_dialog::display(_("Error"), $message, ERROR_DIALOG);
-      }
-    }
-    return '';
-  }
 }
 ?>
diff --git a/include/php_setup.inc b/include/php_setup.inc
index f38ddf6378433240a0a448a635d574bf676d3517..1c4ce0302154cbf0d3583516f2c85ad21a0ff10a 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -258,12 +258,17 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   $error_collector_mailto .= $mailto_trace;
 
   /* Flush in case of fatal errors */
-  set_error_handler('gosaRaiseError', E_WARNING | E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT);
-  if (preg_match('/^fatal/i', $errstr)) {
+  if (preg_match('/^fatal/i', $errstr) || (PHP_ERROR_FATAL == 'TRUE')) {
+    session::destroy();
+    if (PHP_ERROR_FATAL == 'TRUE') {
+      $error_collector = str_replace('display: none;', '', $error_collector);
+    }
     echo $error_collector."</div>";
     flush();
     exit;
   }
+
+  set_error_handler('gosaRaiseError', E_WARNING | E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT);
 }
 
 /*!
diff --git a/include/select/class_filterLDAPBlacklist.inc b/include/select/class_filterLDAPBlacklist.inc
index dd755483baa93a4f10579665f9228157d8a7ce14..e12c77e37afda6795dff5e6f3df9ac624f24fe5a 100644
--- a/include/select/class_filterLDAPBlacklist.inc
+++ b/include/select/class_filterLDAPBlacklist.inc
@@ -34,8 +34,6 @@ class filterLDAPBlacklist {
       $wlist = session::get('filterWhitelist');
       if (!empty($wlist)) {
         foreach ($entries as $id => $entry) {
-          $dn1 = $entry['dn'];
-          $dn2 = $wlist['dn'];
           if (in_array($entry['dn'], $wlist['dn'])) {
             continue;
           }
diff --git a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
index 2c00272166dce3b7357ca79fe59a251ccc6230b5..4c4351a5bc649045565eb4f308786cbc79105983 100644
--- a/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
+++ b/include/simpleplugin/attributes/class_BaseSelectorAttribute.inc
@@ -91,7 +91,6 @@ class BaseSelectorAttribute extends Attribute
         }
         if ($this->value != $this->baseSelector->getBase()) {
           $this->setValue($this->baseSelector->getBase());
-          $this->plugin->is_modified = TRUE;
         }
       }
     }
@@ -175,4 +174,3 @@ class BaseSelectorAttribute extends Attribute
     }
   }
 }
-
diff --git a/include/simpleplugin/attributes/class_BooleanAttribute.inc b/include/simpleplugin/attributes/class_BooleanAttribute.inc
index bb59958f4b5e7e94c6e1ba8518249f61f8eea7c0..cc3f26068a6245a8a61fb4b348c5394ae18b6bbc 100644
--- a/include/simpleplugin/attributes/class_BooleanAttribute.inc
+++ b/include/simpleplugin/attributes/class_BooleanAttribute.inc
@@ -147,3 +147,4 @@ class ObjectClassBooleanAttribute extends BooleanAttribute
     }
   }
 }
+
diff --git a/include/simpleplugin/attributes/class_FileAttribute.inc b/include/simpleplugin/attributes/class_FileAttribute.inc
index 179bea0662c4f4cafa51493cf7fd745d69508cd9..20de46d5c904d6b6291d70c2d12c5cb10bd79cb2 100644
--- a/include/simpleplugin/attributes/class_FileAttribute.inc
+++ b/include/simpleplugin/attributes/class_FileAttribute.inc
@@ -41,7 +41,7 @@ class FileAttribute extends Attribute
         // Reading content
         $this->readFile($handle);
       }
-      /* so that we only handle the file once */
+      // so that we only handle the file once
       $_FILES[$this->getHtmlId()]['name'] = "";
     }
   }
@@ -153,13 +153,15 @@ class FileDownloadAttribute extends FileAttribute
 
 class FileTextAreaAttribute extends FileDownloadAttribute
 {
-  function __construct ($label, $description, $ldapName, $required = FALSE, $extension = '.txt', $upload = TRUE, $defaultValue = "", $acl = "")
+  /* Default values are not the same that for FileDownloadAttribute */
+  function __construct ($label, $description, $ldapName, $required = FALSE, $extension = '.txt', $upload = TRUE, $defaultValue = '', $acl = '')
   {
     parent::__construct(
       $label, $description, $ldapName, $required,
       $extension, $upload, $defaultValue, $acl
     );
   }
+
   /*! \brief Update this attributes postValue depending of the $_POST values
    */
   function loadPostValue ()
@@ -188,6 +190,12 @@ class FileTextAreaAttribute extends FileDownloadAttribute
     }
   }
 
+  function fixPostValue ($value)
+  {
+    /* Replace CRLF by LF, to avoid non-ASCII chars */
+    return str_replace(array("\r\n", "\r"), "\n", $value);
+  }
+
   function renderFormInput ()
   {
     $id = $this->getHtmlId();
@@ -197,14 +205,9 @@ class FileTextAreaAttribute extends FileDownloadAttribute
     return $this->renderAcl($display).parent::renderFormInput();
   }
 
-  function fixPostValue ($value)
-  {
-    /* Replace CRLF by LF, to avoid non-ASCII chars */
-    return str_replace(array("\r\n", "\r"), "\n", $value);
-  }
-
   public function htmlIds()
   {
+    $id     = $this->getHtmlId();
     $ids    = parent::htmlIds();
     $ids[]  = $id.'_text';
     return $ids;
@@ -305,7 +308,7 @@ class ImageAttribute extends FileAttribute
   {
     $this->setValue($this->inputValue($this->getValue()));
     $id = $this->getHtmlId();
-    /* Just to be sure the image is not cached */
+    // Just to be sure the image is not cached
     srand((double)microtime() * 1000000);
     $display  = '<img id="'.$id.'_img"'.
                 ($this->disabled? 'disabled="disabled"':'').
diff --git a/include/simpleplugin/attributes/class_SetAttribute.inc b/include/simpleplugin/attributes/class_SetAttribute.inc
index 7ecd4f5ca3679c99cf1c489227d1ff481912d0e6..53679615ddd99e59d72590e7537bc5ee552f5898 100644
--- a/include/simpleplugin/attributes/class_SetAttribute.inc
+++ b/include/simpleplugin/attributes/class_SetAttribute.inc
@@ -234,7 +234,7 @@ class SetAttribute extends Attribute
         $this->attribute->renderAttribute($attributes, $readOnly);
         $attributes[$this->getLdapName().'_buttons'] = array(
           'htmlid'      => 'add'.$this->getHtmlId(),
-          'label'       => '{literal}'.$this->getLabel().'{/literal}'.($this->isRequired()?'{$must}':''),
+          'label'       => '',
           'description' => '',
           'input'       => $this->renderButtons(),
         );
@@ -672,7 +672,8 @@ class SubNodesAttribute extends OrderedArrayAttribute
     /* Should we take dn from attrs or plugin? */
     if (isset($attrs['dn'])) {
       $ldap = $config->get_ldap_link();
-      $ldap->ls('objectClass='.$this->objectClass, $attrs['dn']);
+      $ldap->cd($attrs['dn']);
+      $ldap->search('objectClass='.$this->objectClass, array('*'), 'one');
       $this->value = array();
       while ($subattrs = $ldap->fetch()) {
         $this->attribute->resetToDefault();
@@ -690,15 +691,14 @@ class SubNodesAttribute extends OrderedArrayAttribute
   /* Not saving anything into base node */
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
   }
 
   /* Special LDAP treatment that this attribute does after plugin ldap save */
   function postLdapSave ($ldap)
   {
     /* First delete all old nodes */
-    $ldap->ls('objectClass='.$this->objectClass, $this->plugin->dn, array('dn'));
+    $ldap->cd($this->plugin->dn);
+    $ldap->search('objectClass='.$this->objectClass, array('dn'), 'one');
     $delete = array();
     while ($attrs = $ldap->fetch()) {
       $delete[] = $attrs['dn'];
diff --git a/include/simpleplugin/attributes/class_StringAttribute.inc b/include/simpleplugin/attributes/class_StringAttribute.inc
index 38e03c9af22849f5e518cb05a877726d6adfcc75..e06dc40919000cb6d220f077f10b9181ad3e304e 100644
--- a/include/simpleplugin/attributes/class_StringAttribute.inc
+++ b/include/simpleplugin/attributes/class_StringAttribute.inc
@@ -41,7 +41,7 @@ class StringAttribute extends Attribute
   {
     parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
     $this->pattern = $regexp;
-    $this->example = ($example === NULL?$defaultValue:$example);
+    $this->example = ($example === NULL ? $defaultValue : $example);
   }
 
   function setExample ($example)
@@ -116,7 +116,7 @@ class TextAreaAttribute extends StringAttribute
   {
     $id = $this->getHtmlId();
     $display  = '<textarea name="'.$id.'" id="'.$id.'"'.
-                ($this->disabled? 'disabled="disabled"':'').'>'.
+                ($this->disabled ? ' disabled="disabled"' : '').'>'.
                 '{literal}'.htmlentities($this->getValue(), ENT_COMPAT, 'UTF-8').'{/literal}</textarea>';
     return $this->renderAcl($display);
   }
@@ -136,7 +136,7 @@ class PasswordAttribute extends StringAttribute
       'password', $id,
       array(
         'value' => '{literal}'.htmlentities($this->getValue(), ENT_COMPAT, 'UTF-8').'{/literal}',
-        'autocomplete' => ($this->autocomplete?'on':'off'),
+        'autocomplete' => ($this->autocomplete ? 'on' : 'off'),
       )
     );
     if ($this->autocomplete === FALSE) {
@@ -150,4 +150,3 @@ class PasswordAttribute extends StringAttribute
     return parent::renderFormInput();
   }
 }
-
diff --git a/include/simpleplugin/class_Attribute.inc b/include/simpleplugin/class_Attribute.inc
index 14bf31c406bc2db2f0caf87d45c45bc49f839368..5e6328658d443e8c4ceb871e8f01f89458b21e3b 100644
--- a/include/simpleplugin/class_Attribute.inc
+++ b/include/simpleplugin/class_Attribute.inc
@@ -18,6 +18,11 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \file class_Attribute.inc
+ * Source code for the main Attribute class
+ */
+
 /*! \brief This class allow to handle easily any kind of LDAP attribute
  *
  */
@@ -551,8 +556,8 @@ class Attribute
       }
       $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()),
+        'label'       => '{literal}'.$this->getLabel().'{/literal}'.($this->isRequired() ? '{$must}' : ''),
+        'description' => ($this->isRequired() ? sprintf(_("%s (required)"), $this->getDescription()) : $this->getDescription()),
         'input'       => $input,
       );
     }
@@ -570,7 +575,7 @@ class Attribute
         $type[] = $class;
         $class  = get_parent_class($class);
       }
-       /* To avoid empty array */
+      /* Avoid empty array */
       $type[] = 'Attribute';
       $infos = array(
         'htmlid'      => $this->getHtmlId(),
@@ -608,20 +613,20 @@ class Attribute
    */
   function renderAcl($display)
   {
-    return '{render acl=$'.$this->getAcl()."ACL}\n$display\n{/render}";
+    return '{render aclName="'.$this->getAcl().'" acl=$'.$this->getAcl()."ACL}\n$display\n{/render}";
   }
 
   /*! \brief Get ACL information about the ACL we need to create
    */
   function getAclInfo ()
   {
-    /* If acl is not empty, we use an acl that is not ours, we have no acl to create */
     if (empty($this->acl)) {
       return array(
         'name' => $this->getHtmlId(),
         'desc' => $this->getDescription()
       );
     } else {
+      /* If acl is not empty, we use an acl that is not ours, we have no acl to create */
       return FALSE;
     }
   }
@@ -685,7 +690,7 @@ class Attribute
   {
     $input  = '<input type="'.$type.'" '.
               'name="'.$name.'" id="'.$name.'"'.
-              ($this->disabled? ' disabled="disabled"':'');
+              ($this->disabled ? ' disabled="disabled"' : '');
     foreach ($attributes as $label => $value) {
       $input .= ' '.$label.'="'.$value.'"';
     }
@@ -777,8 +782,6 @@ class ReadOnlyLDAPAttribute extends DisplayLDAPAttribute
 {
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset($attrs[$this->getLdapName()]);
   }
 }
 
@@ -822,5 +825,4 @@ class DisplayAttribute extends DisplayLDAPAttribute
     $this->setInLdap(FALSE);
   }
 }
-
 ?>
diff --git a/include/simpleplugin/class_helpersAttribute.inc b/include/simpleplugin/class_helpersAttribute.inc
index c6fe058b3cf4f4e26071a868d7a727a7ef138444..9795345dd386135dd511a52347f658c42f8d2d28 100644
--- a/include/simpleplugin/class_helpersAttribute.inc
+++ b/include/simpleplugin/class_helpersAttribute.inc
@@ -18,31 +18,14 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-
 /*! \brief This class allow to handle easily a String LDAP attribute that contains a mail address
  *
  */
 class MailAttribute extends StringAttribute
 {
-  private $template;
-  /*! \brief The constructor of MailAttribute
-   *
-   *  \param string $label The label to show for this 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 boolean $template Should this email field accept template character '%' ?
-   */
-  function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = "", $acl = "", $template = FALSE)
-  {
-    parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
-    $this->template = $template;
-  }
   function validate ()
   {
-    if (!tests::is_email($this->value, $this->template)) {
+    if (!tests::is_email($this->value)) {
       return msgPool::invalid($this->getLabel(), $this->value);
     }
   }
diff --git a/include/simpleplugin/class_multiPlugin.inc b/include/simpleplugin/class_multiPlugin.inc
index d33427545eb72b415811e87a47cc4ff24ee59824..eda8457c8f9e33889f818a86134e1f4216963de0 100644
--- a/include/simpleplugin/class_multiPlugin.inc
+++ b/include/simpleplugin/class_multiPlugin.inc
@@ -85,10 +85,10 @@ class multiPlugin extends simplePlugin
     /* Execude  objects */
     $is_first = TRUE;
 
-    $ReadOnly = (!isset($this->parent) || !$this->parent) && !session::is_set('edit');
+    $readOnly = $this->readOnly();
 
     foreach ($this->plugin as &$plug) {
-      $plug->read_only = $ReadOnly;
+      $plug->read_only = $readOnly;
       if (!$is_first) {
         $display .= '<p class="seperator plugbottom">&nbsp;</p>';
       } else {
@@ -156,26 +156,36 @@ class multiPlugin extends simplePlugin
   /* Save to LDAP */
   function save()
   {
+    $errors = array();
     /* Save objects */
     foreach ($this->plugin as &$plug) {
       $plug->dn = $this->dn;
       if ($plug->is_account || $plug->ignore_account) {
-        $plug->save();
+        $result = $plug->save();
       } else {
-        $plug->remove_from_parent();
+        $result = $plug->remove_from_parent();
+      }
+      if (!empty($result)) {
+        $errors = array_merge($errors, $result);
       }
     }
     unset($plug);
+    return $errors;
   }
 
   function remove_from_parent()
   {
+    $errors = array();
     /* Remove objects */
     foreach ($this->plugin as &$plug) {
       $plug->dn = $this->dn;
-      $plug->remove_from_parent();
+      $result = $plug->remove_from_parent();
+      if (!empty($result)) {
+        $errors = array_merge($errors, $result);
+      }
     }
     unset($plug);
+    return $errors;
   }
 
   function adapt_from_template($attrs, $skip = array())
@@ -188,8 +198,6 @@ class multiPlugin extends simplePlugin
     unset($plug);
   }
 
-  /* Prepare the connectivity obj
-   */
   function resetCopyInfos()
   {
     $this->dn = 'new';
@@ -198,15 +206,6 @@ class multiPlugin extends simplePlugin
     }
     unset($plug);
   }
-
-  /* Prepare the connectivity obj
-   */
-  function postCopyHook()
-  {
-    foreach ($this->plugin as &$plug) {
-      $plug->postCopyHook();
-    }
-  }
 }
 
 ?>
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 1d99769d9b5958992c280288dfc8d45f726c65a2..a2a23fd955ef394dbdbe568986ce7733729b564e 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -85,6 +85,7 @@ class templateDialog
   function setNextTarget ($target)
   {
     $this->target = $target;
+    $this->template->reset();
   }
 
   function execute ()
@@ -113,13 +114,56 @@ class templateDialog
   }
 }
 
-class simpleManagement extends management
+class simpleManagement
 {
-  /* Management attributes we override */
-  protected $tabClass     = 'simpleTabs';
-  protected $tabType      = '';
-  protected $aclCategory  = '';
-  protected $aclPlugin    = '';
+  // The currently used object(s) (e.g. in edit, removal)
+  // $dn is public due to some compatibility problems with class plugin..
+  public $dn      = '';
+  protected $dns  = array();
+
+  // The last used object(s).
+  protected $last_dn  = '';
+  protected $last_dns = array();
+
+  // The common places the displayed objects are stored in. (e.g. array("ou=groups,",".."))
+  protected $storagePoints = array();
+
+  // The opened object.
+  protected $tabObject    = NULL;
+  protected $dialogObject = NULL;
+
+  // The last opened object.
+  protected $last_tabObject     = NULL;
+  protected $last_dialogObject  = NULL;
+
+  // Whether to display the apply button or not
+  protected $displayApplyBtn = FALSE;
+
+  // Whether to display a header or not.
+  protected $skipHeader = FALSE;
+
+  // Whether to display a footer or not.
+  protected $skipFooter = FALSE;
+
+  // Copy&Paste handler
+  protected $cpHandler = NULL;
+
+  // Indicates that we want to paste objects right now.
+  protected $cpPastingStarted = FALSE;
+
+  // The Snapshot handler class.
+  protected $snapHandler = NULL;
+
+  // The listing handlers
+  protected $headpage = NULL;
+  protected $filter   = NULL;
+
+  // A list of configured actions/events
+  protected $actions = array();
+
+  // Some management classes are used in tab groups and needs this
+  public $is_template = FALSE;
+  public $attributes  = array();
 
   /* Attributes that child classes should override */
   protected $objectTypes  = array();
@@ -134,12 +178,14 @@ class simpleManagement extends management
   protected $listXMLPath      = NULL;
   protected $autoFilter       = TRUE;
   protected $autoActions      = TRUE;
+  protected $skipCpHandler    = FALSE;
+  protected $skipSnapHandler  = FALSE;
 
   protected $autoFilterAttributes = array('dn', 'cn', 'description');
 
   protected $headpageClass = "listing";
 
-  protected $skipTemplates = TRUE;
+  public static $skipTemplates = TRUE;
 
   function __construct()
   {
@@ -172,7 +218,7 @@ class simpleManagement extends management
     }
     $this->storagePoints = array_unique($this->storagePoints);
     if (count($this->storagePoints) == 0) {
-      $this->storagePoints[] = "";
+      $this->storagePoints[] = '';
     }
 
     // Build filter
@@ -185,10 +231,35 @@ class simpleManagement extends management
     $this->setFilter($filter);
 
     // Build headpage
-    $headpage = new $this->headpageClass($this->parseXML($this->listXMLPath));
-    $headpage->setFilter($filter);
+    $this->headpage = new $this->headpageClass($this->parseXML($this->listXMLPath));
+    $this->headpage->setFilter($filter);
+
+    // Add copy&paste and snapshot handler.
+    if (!$this->skipCpHandler) {
+      $this->cpHandler = new CopyPasteHandler();
+      $this->headpage->setCopyPasteHandler($this->cpHandler);
+      $this->registerAction('copy',   'copyPasteHandler');
+      $this->registerAction('cut',    'copyPasteHandler');
+      $this->registerAction('paste',  'copyPasteHandler');
+    }
+    if (!$this->skipSnapHandler && ($config->get_cfg_value('enableSnapshots') == 'TRUE')) {
+      $this->snapHandler = new SnapshotHandler();
+      $this->headpage->setSnapshotHandler($this->snapHandler);
+      $this->registerAction('snapshot', 'createSnapshotDialog');
+      $this->registerAction('restore',  'restoreSnapshotDialog');
+    }
+
+    // Register default actions
+    $this->registerAction('new',    'newEntry');
+    $this->registerAction('edit',   'editEntry');
+    $this->registerAction('apply',  'applyChanges');
+    $this->registerAction('save',   'saveChanges');
+
+    $this->registerAction('cancel',       'cancelEdit');
+    $this->registerAction('cancelDelete', 'cancelEdit');
 
-    parent::__construct('unused', $headpage);
+    $this->registerAction('remove',           'removeEntryRequested');
+    $this->registerAction('removeConfirmed',  'removeEntryConfirmed');
 
     $this->configureHeadpage();
     $this->configureFilter();
@@ -201,7 +272,7 @@ class simpleManagement extends management
   function configureHeadpage ()
   {
     if ($this->autoActions) {
-      if ($this->skipTemplates) {
+      if (static::$skipTemplates) {
         $this->headpage->xmlData['actionmenu']['action'][0]['action'] = array();
       } else {
         $this->headpage->xmlData['actionmenu']['action'][0]['action'] = array(
@@ -229,28 +300,29 @@ class simpleManagement extends management
         $i['icon'] = '';
       }
 
+      $filterObject = objects::getFilterObject($object);
       $this->headpage->objectTypes[$object] =
         array(
           'label'       => $i['name'],
           'category'    => $i['aclCategory'],
           'class'       => $i['mainTab'],
           'image'       => $i['icon'],
-          'filter'      => ldapFilter::parse($i['filter']),
+          'filter'      => $filterObject,
           'nameAttr'    => $i['nameAttr'],
         );
-      if (!$this->skipTemplates) {
+      if (!static::$skipTemplates) {
         $this->headpage->objectTypes['template_'.$object] =
           array(
             'label'       => sprintf(_('%s template'), $i['name']),
             'category'    => $i['aclCategory'],
             'class'       => 'template',
-            'image'       => $i['icon'],//FIXME
+            'image'       => $i['icon'],
             'filter'      =>
               new ldapFilter(
                 '&',
                 array(
                   new ldapFilterLeaf('objectClass', '=', 'fdTemplate'),
-                  fdTemplateFilter(ldapFilter::parse($i['filter'])),
+                  fdTemplateFilter($filterObject),
                 )
               ),
             'nameAttr'    => $i['nameAttr'],
@@ -275,7 +347,7 @@ class simpleManagement extends management
           'label' => $i['name'],
           'acl'   => $i['aclCategory'].'/'.$i['mainTab'].'[c]',
         );
-        if (!$this->skipTemplates) {
+        if (!static::$skipTemplates) {
           $this->registerAction('new_template_'.$object, 'newEntryTemplate');
           $this->registerAction('template_apply_'.$object, 'newEntryFromTemplate');
           $this->headpage->xmlData['actionmenu']['action'][0]['action'][0]['action'][] = array(
@@ -295,6 +367,9 @@ class simpleManagement extends management
         }
       }
     }
+    if ($this->autoActions && !static::$skipTemplates) {
+      $this->registerAction('template_apply', 'newEntryFromTemplate');
+    }
     $this->headpage->refreshBasesList();
   }
 
@@ -350,7 +425,7 @@ class simpleManagement extends management
         $attributes[] = $i['mainAttr'];
         $attributes[] = $i['nameAttr'];
       }
-      if (!$this->skipTemplates) {
+      if (!static::$skipTemplates) {
         $tag    = 'FILTERTEMPLATE';
         $filter .= '$'.$tag;
         $this->filter->elements[$tag] = array(
@@ -385,6 +460,38 @@ class simpleManagement extends management
     return $data;
   }
 
+  function getHeadpage()
+  {
+    return $this->headpage;
+  }
+
+  function getFilter()
+  {
+    return $this->filter;
+  }
+
+  /*!
+   * \brief Set a new filter
+   *
+   * \param object $filter The new filter
+   */
+  function setFilter($filter)
+  {
+    $this->filter = $filter;
+  }
+
+  /*!
+   *  \brief  Every click in the list user interface sends an event
+   *          here can we connect those events to a method.
+   *          eg. see simpleManagement::registerEvent('new','createUser')
+   *          When the action/event new is send, the method 'createUser'
+   *          will be called.
+   */
+  function registerAction($action, $target)
+  {
+    $this->actions[$action] = $target;
+  }
+
   function getType($dn)
   {
     return $this->getHeadpage()->getType($dn);
@@ -401,16 +508,149 @@ class simpleManagement extends management
         'label' => sprintf(_('Show %s'), $config->data['OBJECTS'][$object]['name'])
       );
     }
-    if (!$this->skipTemplates) {
+    if (!static::$skipTemplates) {
       $filters[] = array(
         'id'    => 'FILTERTEMPLATE',
         'label' => sprintf(_('Show %s'), _('Template'))
       );
     }
     $smarty->assign('objectFilters', $filters);
-    return parent::renderList();
+    $this->headpage->update();
+    $display = $this->headpage->render();
+    return $this->getHeader().$display;
+  }
+
+  /*!
+   * \brief  Execute this plugin
+   *          Handle actions/events, locking, snapshots, dialogs, tabs,...
+   */
+  function execute()
+  {
+    // Ensure that html posts and gets are kept even if we see a 'Entry islocked' dialog.
+    $vars = array('/^act$/','/^listing/','/^PID$/');
+    session::set('LOCK_VARS_TO_USE', $vars);
+
+    /* Display the copy & paste dialog, if it is currently open */
+    $ret = $this->copyPasteHandler();
+    if ($ret) {
+      return $this->getHeader().$ret;
+    }
+
+    // Update filter
+    if ($this->filter) {
+      $this->filter->update();
+      session::global_set(get_class($this).'_filter', $this->filter);
+      session::set('autocomplete', $this->filter);
+      if (!$this->filter->isValid()) {
+        msg_dialog::display(_('Filter error'), _('The filter is incomplete!'), ERROR_DIALOG);
+      }
+    }
+
+    // Handle actions (POSTs and GETs)
+    $str = $this->handleActions($this->detectPostActions());
+    if ($str) {
+      return $this->getHeader().$str;
+    }
+
+    // Open single dialog objects
+    if (is_object($this->dialogObject)) {
+      if (method_exists($this->dialogObject, 'save_object')) {
+        $this->dialogObject->save_object();
+      }
+      if (method_exists($this->dialogObject, 'execute')) {
+        $display = $this->dialogObject->execute();
+        $display .= $this->_getTabFooter();
+        return $this->getHeader().$display;
+      }
+    }
+
+    // Display tab object.
+    if ($this->tabObject instanceOf simpleTabs) {
+      $this->tabObject->save_object();
+      $display = $this->tabObject->execute();
+      $display .= $this->_getTabFooter();
+      return $this->getHeader().$display;
+    }
+
+    // Set current restore base for snapshot handling.
+    if (is_object($this->snapHandler)) {
+      $bases = array();
+      foreach ($this->storagePoints as $sp) {
+        $bases[] = $sp.$this->headpage->getBase();
+      }
+
+      // No bases specified? Try base
+      if (!count($bases)) {
+        $bases[] = $this->headpage->getBase();
+      }
+
+      $this->snapHandler->setSnapshotBases($bases);
+    }
+
+    // Display list
+    return $this->renderList();
   }
 
+  /*!
+   * \brief  Generates the plugin header which is displayed whenever a tab object is opened.
+   */
+  protected function getHeader()
+  {
+    if ($this->skipHeader) {
+      return '';
+    }
+
+    $plInfos  = pluglist::pluginInfos(get_class($this));
+    $plTitle  = $plInfos['plTitle'];
+    $plIcon   = $plInfos['plIcon'];
+
+    if (!preg_match('/^geticon/', $plIcon)) {
+      $plIcon = get_template_path($plIcon);
+    }
+    return print_header($plIcon, $plTitle, get_object_info());
+  }
+
+  /*!
+   * \brief  Generates the footer which is used whenever a tab object is displayed.
+   */
+  protected function _getTabFooter()
+  {
+    // Do not display tab footer for non tab objects
+    if (!($this->tabObject instanceOf simpleTabs)) {
+      return '';
+    }
+
+    // Check if there is a dialog opened - We don't need any buttons in this case.
+    if ($this->tabObject->dialogOpened()) {
+      return '';
+    }
+
+    // Skip footer if requested;
+    if ($this->skipFooter) {
+      return '';
+    }
+
+    // In case an of locked entry, we may have opened a read-only tab.
+    $str = '';
+    if ($this->tabObject->readOnly()) {
+      $str .= '<p class="plugbottom">'."\n".
+        '<input type="submit" name="edit_cancel" value="'.msgPool::cancelButton().'">'."\n".
+        '</p>';
+      return $str;
+    } else {
+      // Display ok, (apply) and cancel buttons
+      $str .= '<p class="plugbottom">'."\n";
+      $str .= '<input type="submit" name="edit_finish" style="width:80px" value="'.msgPool::okButton().'"/>'."\n";
+      $str .= "&nbsp;\n";
+      if ($this->displayApplyBtn) {
+        $str .= '<input type="submit" name="edit_apply" value="'.msgPool::applyButton().'"/>'."\n";
+        $str .= "&nbsp;\n";
+      }
+      $str .= '<input type="submit" name="edit_cancel" value="'.msgPool::cancelButton().'"/>'."\n";
+      $str .= '</p>';
+    }
+    return $str;
+  }
 
   /*!
    * \brief  This method intiates the object creation.
@@ -420,14 +660,8 @@ class simpleManagement extends management
    * \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 $altTabClass Empty string.
-   *
-   * \param String $altTabType Empty string.
-   *
-   * \param String $altAclCategory Empty string.
    */
-  function newEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
+  function newEntry($action, array $target, array $all)
   {
     $type   = strtoupper(preg_replace('/^new_/', '', $action));
 
@@ -442,9 +676,9 @@ class simpleManagement extends management
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Create new entry initiated!");
   }
 
-  function newEntryTemplate($action = "", $target = array(), $all = array())
+  function newEntryTemplate($action, array $target, array $all)
   {
-    if ($this->skipTemplates) {
+    if (static::$skipTemplates) {
       return;
     }
     $action = preg_replace('/^new_template_/', 'new_', $action);
@@ -452,9 +686,9 @@ class simpleManagement extends management
     $this->tabObject->setTemplateMode('template_cn');
   }
 
-  function newEntryFromTemplate($action, $target = array())
+  function newEntryFromTemplate($action, array $target, array $all)
   {
-    if ($this->skipTemplates) {
+    if (static::$skipTemplates) {
       return;
     }
     if (isset ($target[0])) {
@@ -462,14 +696,22 @@ class simpleManagement extends management
     } else {
       $dn = NULL;
     }
-    $type = preg_replace('/^template_apply_/', '', $action);
+    if ($action == 'template_apply') {
+      if ($dn === NULL) {
+        return;
+      }
+      $type = $this->getType($dn);
+      $type = preg_replace('/^template_/', '', $type);
+    } else {
+      $type = preg_replace('/^template_apply_/', '', $action);
+    }
     $this->dialogObject = new templateDialog($this, $type, $dn);
   }
 
-  function applyTemplateToEntry($action, $target = array())
+  function applyTemplateToEntry($action, array $target, array $all)
   {
     global $ui;
-    if ($this->skipTemplates) {
+    if (static::$skipTemplates) {
       return;
     }
     if (empty($target)) {
@@ -492,21 +734,20 @@ class simpleManagement extends management
 
   function handleTemplateApply ($cancel = FALSE)
   {
-    if ($this->skipTemplates) {
+    if (static::$skipTemplates) {
       return;
     }
     if ($cancel) {
       $msgs = array();
     } else {
-      $msgs = $this->tabObject->check();
+      $msgs = $this->tabObject->save();
     }
     if (count($msgs)) {
       msg_dialog::displayChecks($msgs);
       return;
     } else {
       if (!$cancel) {
-        $this->tabObject->save();
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "Template applied!");
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Template applied!');
       }
       del_lock($this->dn);
       if (empty($this->dns)) {
@@ -523,10 +764,8 @@ class simpleManagement extends management
 
   /*!
    * \brief  Save object modifications and closes dialogs (returns to object listing).
-   *          - Calls 'tab::check' to validate the given input.
-   *          - Calls 'tab::save' to save back object modifications (e.g. to ldap).
-   *          - Calls 'management::remove_locks' to remove eventually created locks.
-   *          - Calls 'management::closeDialogs' to return to the object listing.
+   *          - Calls 'simpleTabs::save' to save back object modifications (e.g. to ldap).
+   *          - Calls 'simpleManagement::closeDialogs' to return to the object listing.
    */
   protected function saveChanges()
   {
@@ -535,7 +774,47 @@ class simpleManagement extends management
       $this->handleTemplateApply();
       return;
     }
-    parent::saveChanges();
+    if ($this->tabObject instanceOf simpleTabs) {
+      $this->tabObject->save_object();
+      $msgs = $this->tabObject->save();
+      if (count($msgs)) {
+        msg_dialog::displayChecks($msgs);
+        return;
+      } else {
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
+        $this->remove_lock();
+        $this->closeDialogs();
+      }
+    } elseif ($this->dialogObject instanceOf simplePlugin) {
+      $this->dialogObject->save_object();
+      $msgs = $this->dialogObject->check();
+      if (count($msgs)) {
+        msg_dialog::displayChecks($msgs);
+        return;
+      } else {
+        $this->dialogObject->save();
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Entry saved!');
+        $this->remove_lock();
+        $this->closeDialogs();
+      }
+    }
+  }
+
+  /*!
+   *  \brief  Save object modifications and keep dialogs opened
+   */
+  protected function applyChanges()
+  {
+    if ($this->tabObject instanceOf simpleTabs) {
+      $this->tabObject->save_object();
+      $msgs = $this->tabObject->save();
+      if (count($msgs)) {
+        msg_dialog::displayChecks($msgs);
+      } else {
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dns, 'Modifications applied!');
+        $this->tabObject->re_init();
+      }
+    }
   }
 
   /*!
@@ -548,10 +827,10 @@ class simpleManagement extends management
       $this->handleTemplateApply(TRUE);
       return;
     }
-    parent::cancelEdit();
+    $this->remove_lock();
+    $this->closeDialogs();
   }
 
-
   /*!
    * \brief  This method opens an existing object or a list of existing objects to be edited.
    *
@@ -560,14 +839,8 @@ class simpleManagement extends management
    * \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 $altTabClass Empty string.
-   *
-   * \param String $altTabType Empty string.
-   *
-   * \param String $altAclCategory Empty string.
    */
-  function editEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
+  function editEntry($action, array $target, array $all)
   {
     global $ui;
     // Do not create a new tabObject while there is already one opened,
@@ -581,7 +854,7 @@ class simpleManagement extends management
     // Single edit - we only got one object dn.
     if (count($target) == 1) {
       $type = $this->getType($target[0]);
-      if (preg_match('/^template_/', $type) && !$this->skipTemplates) {
+      if (preg_match('/^template_/', $type) && !static::$skipTemplates) {
         $type = preg_replace('/^template_/', '', $type);
       }
 
@@ -606,7 +879,52 @@ class simpleManagement extends management
     }
   }
 
-  function handleSubAction($all)
+  /*!
+   * \brief  Detects actions/events send by the ui
+   *           and the corresponding targets.
+   */
+  function detectPostActions()
+  {
+    if (!is_object($this->headpage)) {
+      trigger_error("No valid headpage given....!");
+      return array();
+    }
+    $action = $this->headpage->getAction();
+    if (isset($_POST['edit_cancel'])) {
+      $action['action'] = 'cancel';
+    } elseif (isset($_POST['edit_finish'])) {
+      $action['action'] = 'save';
+    } elseif (isset($_POST['edit_apply'])) {
+      $action['action'] = 'apply';
+    }
+    if (!$this->is_modal_dialog()) {
+      if (isset($_POST['delete_confirmed'])) {
+        $action['action'] = 'removeConfirmed';
+      }
+      if (isset($_POST['delete_cancel'])) {
+        $action['action'] = 'cancelDelete';
+      }
+    }
+
+    return $action;
+  }
+
+  /*!
+   *  \brief  Calls the registered method for a given action/event.
+   */
+  function handleActions($action)
+  {
+    // Start action
+    if (isset($this->actions[$action['action']])) {
+      $func = $this->actions[$action['action']];
+      if (!isset($action['targets'])) {
+        $action['targets'] = array();
+      }
+      return $this->$func($action['action'], $action['targets'], $action);
+    }
+  }
+
+  protected function handleSubAction($all)
   {
     if (preg_match('/^tab_/', $all['subaction'])) {
       $tab = preg_replace('/^tab_/', '', $all['subaction']);
@@ -620,10 +938,58 @@ class simpleManagement extends management
     return FALSE;
   }
 
+  function openTabObject($object, $base)
+  {
+    $this->tabObject = $object;
+    $this->tabObject->set_acl_base($base);
+    $this->tabObject->parent = &$this;
+  }
+
+  /*!
+   * \brief  This method closes dialogs
+   *          and cleans up the cached object info and the ui.
+   */
+  public function closeDialogs()
+  {
+    $this->last_dn  = $this->dn;
+    $this->dn       = "";
+    $this->last_dns = $this->dns;
+    $this->dns      = array();
+
+    $this->last_tabObject     = $this->tabObject;
+    $this->tabObject          = NULL;
+    $this->last_dialogObject  = $this->dialogObject;
+    $this->dialogObject       = NULL;
+
+    $this->skipFooter   = FALSE;
+    set_object_info();
+  }
+
+  /*!
+   * \brief  Removes ldap object locks created by this class.
+   *         Whenever an object is edited, we create locks to avoid
+   *         concurrent modifications.
+   *         This locks will automatically removed here.
+   */
+  function remove_lock()
+  {
+    if (!empty($this->dn) && $this->dn != "new") {
+      del_lock($this->dn);
+    }
+    if (count($this->dns)) {
+      del_lock($this->dns);
+    }
+  }
+
+  function is_modal_dialog()
+  {
+    return (is_object($this->tabObject) || is_object($this->dialogObject));
+  }
+
   /*! \brief    Queue selected objects to be removed.
    *            Checks ACLs, Locks and ask for confirmation.
    */
-  protected function removeEntryRequested($action = "", $target = array(), $all = array())
+  protected function removeEntryRequested($action, array $target, array $all)
   {
     global $ui;
     $disallowed = array();
@@ -634,7 +1000,7 @@ class simpleManagement extends management
     // Check permissons for each target
     foreach ($target as $dn) {
       $type = $this->getType($dn);
-      if (preg_match('/^template_/', $type) && !$this->skipTemplates) {
+      if (preg_match('/^template_/', $type) && !static::$skipTemplates) {
         $type = preg_replace('/^template_/', '', $type);
       }
       try {
@@ -665,7 +1031,7 @@ class simpleManagement extends management
       $objects = array();
       foreach ($this->dns as $dn) {
         $type   = $this->getType($dn);
-        if (preg_match('/^template_/', $type) && !$this->skipTemplates) {
+        if (preg_match('/^template_/', $type) && !static::$skipTemplates) {
           $type = preg_replace('/^template_/', '', $type);
           $info = objects::infos($type);
           $info['mainAttr'] = 'cn';
@@ -675,7 +1041,7 @@ class simpleManagement extends management
         $entry  = $this->getHeadpage()->getEntry($dn);
         $objects[] = array(
           'name'  => $entry[$info['mainAttr']][0],
-          'dn'    => LDAP::fix($dn),
+          'dn'    => $dn,
           'icon'  => $info['icon'],
           'type'  => $info['name']
         );
@@ -690,8 +1056,7 @@ class simpleManagement extends management
     }
   }
 
-  function removeEntryConfirmed($action = '', $target = array(), $all = array(),
-                                $altTabClass = '', $altTabType = '', $altAclCategory = '')
+  function removeEntryConfirmed($action, array $target, array $all)
   {
     global $ui;
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removal confirmed!");
@@ -701,7 +1066,7 @@ class simpleManagement extends management
       if (empty($type)) {
         continue;
       }
-      if (preg_match('/^template_/', $type) && !$this->skipTemplates) {
+      if (preg_match('/^template_/', $type) && !static::$skipTemplates) {
         $type = preg_replace('/^template_/', '', $type);
       }
       $infos = objects::infos($type);
@@ -735,7 +1100,7 @@ class simpleManagement extends management
    *
    * \param  Array   $all     A combination of both 'action' and 'target'.
    */
-  function createSnapshotDialog($action = '', $target = array(), $all = array())
+  function createSnapshotDialog($action, array $target)
   {
     global $config, $ui;
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, 'Snaptshot creation initiated!');
@@ -766,7 +1131,7 @@ class simpleManagement extends management
    *
    * \param  Array   $all'     A combination of both 'action' and 'target'.
    */
-  function restoreSnapshotDialog($action = '', $target = array(), $all = array())
+  function restoreSnapshotDialog($action, array $target)
   {
     global $config, $ui;
     // Set current restore base for snapshot handling.
@@ -812,8 +1177,7 @@ class simpleManagement extends management
    *  @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 = "", $target = array(), $all = array(),
-      $altTabClass = "", $altTabType = "", $altAclCategory = "", $altAclPlugin = "")
+  function copyPasteHandler($action = '', array $target = array(), array $all = array())
   {
     global $ui;
     // Return without any actions while copy&paste handler is disabled.
@@ -829,12 +1193,12 @@ class simpleManagement extends management
       $this->cpHandler->cleanup_queue();
       foreach ($target as $dn) {
         $type   = $this->getType($dn);
-        if (preg_match('/^template_/', $type) && !$this->skipTemplates) {
+        if (preg_match('/^template_/', $type) && !static::$skipTemplates) {
           $type = preg_replace('/^template_/', '', $type);
         }
         $infos  = objects::infos($type);
 
-        if (($action == 'copy') && $ui->is_copyable($dn, $infos['aclCategory'], $infos['mainTab'])) {
+        if (($action == 'copy') && $ui->is_copyable($dn, $infos['aclCategory'])) {
           $this->cpHandler->add_to_queue($dn, 'copy', $type);
           @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Entry copied!');
         }
@@ -861,20 +1225,97 @@ class simpleManagement extends management
     // Automatically disable pasting process since there is no entry left to paste.
     if (!$this->cpHandler->entries_queued()) {
       $this->cpPastingStarted = FALSE;
+      $this->cpHandler->resetPaste();
     }
     return "";
   }
 
+  /* Methods related to Snapshots */
+
+  /*!
+   * \brief  Creates a new snapshot entry
+   */
+  function createSnapshot($dn, $description)
+  {
+    global $ui;
+    if ($this->dn !== $dn) {
+      trigger_error('There was a problem with the snapshot workflow');
+      return;
+    }
+    if (!empty($dn) && $ui->allow_snapshot_create($dn, $this->dialogObject->aclCategory)) {
+      $this->snapHandler->createSnapshot($dn, $description);
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot created!');
+    } else {
+      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $dn),
+          ERROR_DIALOG);
+    }
+  }
+
+  /*!
+   * \brief  Restores a snapshot object.
+   *
+   * \param  String  $dn  The DN of the snapshot
+   */
+  function restoreSnapshot($dn)
+  {
+    global $ui;
+    if (!empty($dn) && $ui->allow_snapshot_restore($dn, $this->dialogObject->aclCategory)) {
+      $this->snapHandler->restoreSnapshot($dn);
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, 'Snaptshot restored');
+      $this->closeDialogs();
+    } else {
+      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $dn),
+          ERROR_DIALOG);
+    }
+  }
+
+  /*!
+   * \brief Get all deleted snapshots
+   *
+   * \param string $base The base
+   */
+  function getAllDeletedSnapshots()
+  {
+    $tmp = array();
+    $snapshotBases = $this->snapHandler->getSnapshotBases();
+    if (is_array($snapshotBases)) {
+      foreach ($snapshotBases as $base) {
+        $tmp = array_merge($tmp, $this->snapHandler->getAllDeletedSnapshots($base));
+      }
+    } else {
+      $tmp = $this->snapHandler->getAllDeletedSnapshots($snapshotBases);
+    }
+    return $tmp;
+  }
+
+  /*
+   * \brief Return available snapshots for the given base
+   *
+   * \param string $dn The DN
+   */
+  function getAvailableSnapsShots($dn)
+  {
+    return $this->snapHandler->getAvailableSnapsShots($dn);
+  }
+
+  /*!
+   * \brief Delete a snapshot
+   *
+   * \param string $dn DN of the snapshot
+   */
+  function removeSnapshot($dn)
+  {
+    $this->snapHandler->removeSnapshot($dn);
+  }
+
   static function mainInc ($classname)
   {
     global $remove_lock, $cleanup, $display;
 
     /* Remove locks */
-    if ($remove_lock) {
-      if (session::is_set($classname)) {
-          $macl = session::get($classname);
-          $macl->remove_lock();
-      }
+    if ($remove_lock && session::is_set($classname)) {
+      $macl = session::get($classname);
+      $macl->remove_lock();
     }
 
     if ($cleanup) {
@@ -896,5 +1337,4 @@ class simpleManagement extends management
     }
   }
 }
-
 ?>
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 34a2a0511de7fb1261204422e47c42d980555378..827190d879675e7fe90a277306227d482c43c5a7 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -18,63 +18,130 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+/*!
+ * \file class_simplePlugin.inc
+ * Source code for the class simplePlugin
+ */
+
 /*! \brief This class is made for easy plugin creation for editing LDAP attributes
  *
  */
-class simplePlugin extends plugin
+class simplePlugin
 {
-  /*! \brief This attribute store all information about attributes
-   *
-   */
-  var $attributesInfo;
+  /*! \brief This attribute store all information about attributes */
+  public $attributesInfo;
+
   /*! \brief This attribute store references toward attributes
    *
    * associative array that stores attributeLdapName => reference on object
    */
-  var $attributesAccess = array();
+  public $attributesAccess = array();
 
-  /*! \brief Do we want a header allowing to able/disable this plugin
-   *
+  /*!
+    \brief Mark plugin as account
+
+    Defines whether this plugin is defined as an account or not.
+    This has consequences for the plugin to be saved from tab
+    mode. If it is set to 'FALSE' the tab will call the delete
+    function, else the save function. Should be set to 'TRUE' if
+    the construtor detects a valid LDAP object.
+
+    \sa simplePlugin::is_this_account()
    */
-  protected $displayHeader = FALSE;
+  public $is_account            = FALSE;
+  public $initially_was_account = FALSE;
+  public $ignore_account        = FALSE;
+
+  public $acl_base      = '';
+  public $acl_category  = '';
+
+  /*! \brief dn of the opened object */
+  public $dn      = '';
+
+  /*! \brief original dn of the opened object */
+  public $orig_dn = '';
 
-  /*! \brief Is this plugin the main tab, the one that handle the object itseld
+  /*!
+   * \brief Reference to parent object
    *
+   * This variable is used when the plugin is included in tabs
+   * and keeps reference to the tab class. Communication to other
+   * tabs is possible by 'name'. So the 'fax' plugin can ask the
+   * 'userinfo' plugin for the fax number.
+   *
+   * \sa simpleTabs
+   */
+  public $parent = NULL;
+
+  /*!
+    \brief Mark plugin as template
+
+    Defines whether we are editing a template or a normal object.
+    Has consequences on the way execute() shows the formular and how
+    save() puts the data to LDAP.
    */
+  public $is_template    = FALSE;
+
+  /*!
+    \brief Represent temporary LDAP data
+
+    This should only be used internally.
+   */
+  public $attrs = array();
+
+  /*! \brief The objectClasses set by this tab */
+  protected $objectclasses = array();
+
+  /*! \brief The state of the attributes when we opened the object */
+  protected $saved_attributes = array();
+
+  /*! \brief Do we want a header allowing to able/disable this plugin */
+  protected $displayHeader = FALSE;
+
+  /*! \brief Is this plugin the main tab, the one that handle the object itself */
   protected $mainTab = FALSE;
 
   protected $header = "";
 
-  public $orig_dn = "";
-
   protected $templatePath;
 
+  protected $dialog = FALSE;
+
   /*! \brief Are we executed in a edit-mode environment? (this is FALSE if we're called from management, TRUE if we're called from a main.inc)
    */
   protected $needEditMode = FALSE;
 
-  /*! \brief ldap error cache
-   *
-   */
-  protected $ldap_error;
-
-  /*! \brief Attributes that needs to be initialized before the others.
-   *
-   */
+  /*! \brief Attributes that needs to be initialized before the others */
   protected $preInitAttributes = array();
 
   /*! \brief FALSE to disable inheritance. Array like array ('objectClass' => 'attribute') to specify oc of the groups it might be inherited from
-   *
    */
   protected $inheritance      = FALSE;
   protected $member_of_group  = FALSE;
   protected $editing_group    = NULL;
   protected $group_attrs      = array();
 
+  /*! \brief Used when the entry is opened as "readonly" due to locks */
+  protected $read_only = FALSE;
+
+  /*! \brief Last LDAP error (used by logging calls from post_* methods) */
+  protected $ldap_error;
+
+  /*!
+   * \brief Object entry CSN
+   *
+   * If an entry was edited while we have edited the entry too,
+   * an error message will be shown.
+   * To configure this check correctly read the FAQ.
+   */
+  protected $entryCSN = '';
+
   /*! \brief constructor
    *
    *  \param string $dn The dn of this instance
    *  \param Object $object An object to copy values from
+   *  \param Object $parent A parent instance, usually a simpleTabs instance.
+   *  \param boolean $mainTab Whether or not this is the main tab
    *  \param array $attributesInfo An attributesInfo array, if NULL, getAttributesInfo will be used.
    *
    */
@@ -82,6 +149,7 @@ class simplePlugin extends plugin
   {
     global $config;
 
+    $this->dn       = $dn;
     $this->parent   = $parent;
     $this->mainTab  = $mainTab;
 
@@ -118,16 +186,85 @@ class simplePlugin extends plugin
       }
     }
 
-    // We call plugin constructor
-    parent::__construct($dn, $object);
+    /* Ensure that we've a valid acl_category set */
+    if (empty($this->acl_category)) {
+      $tmp = pluglist::pluginInfos(get_class($this));
+      if (isset($tmp['plCategory'])) {
+        $c = key($tmp['plCategory']);
+        if (is_numeric($c)) {
+          $c = $tmp['plCategory'][0];
+        }
+        $this->acl_category = $c.'/';
+      }
+    }
+
+    /* Handle read only */
+    if ($this->dn != 'new') {
+      /* Check if this entry was opened in read only mode */
+      if (isset($_POST['open_readonly'])) {
+        if (session::global_is_set('LOCK_CACHE')) {
+          $cache = session::get('LOCK_CACHE');
+          if (isset($cache['READ_ONLY'][$this->dn])) {
+            $this->read_only = TRUE;
+          }
+        }
+      }
+
+      /* Save current dn as acl_base */
+      $this->acl_base = $this->dn;
+    }
+
+    /* Load LDAP data */
+    if (($this->dn != 'new' && $this->dn !== NULL) || ($object !== NULL)) {
+      /* Load data to 'attrs' */
+      if ($object !== NULL) {
+        /* From object */
+        $this->attrs = $object->attrs;
+        if (isset($object->is_template)) {
+          $this->setTemplate($object->is_template);
+        }
+      } else {
+        /* From LDAP */
+        $ldap = $config->get_ldap_link();
+        $ldap->cat($this->dn);
+        $this->attrs = $ldap->fetch();
+        if (empty($this->attrs)) {
+          throw new NonExistingLdapNodeException('Could not open dn '.$this->dn);
+        }
+        if ($this->mainTab) {
+          /* Make sure that initially_was_account is TRUE if we loaded an LDAP node,
+           *  even if it’s missing an objectClass */
+          $this->is_account = TRUE;
+        }
+      }
+
+      /* Set the template flag according to the existence of objectClass fdTemplate */
+      if (isset($this->attrs['objectClass'])) {
+        if (in_array_ics ('fdTemplate', $this->attrs['objectClass'])) {
+          @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Template check');
+          $this->setTemplate(TRUE);
+          $this->templateLoadAttrs($this->attrs);
+        }
+      }
+
+      /* Is Account? */
+      if ($this->is_this_account($this->attrs)) {
+        $this->is_account = TRUE;
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, 'found', 'Object check');
+      }
+    }
+
+    $this->loadAttributes();
+
+    $this->prepareSavedAttributes();
 
-    $this->setTemplate($this->is_template);
+    /* Save initial account state */
+    $this->initially_was_account = $this->is_account;
 
     $this->orig_dn = $dn;
 
     if ($this->mainTab) {
       $this->is_account = TRUE;
-      /* TODO: When merging plugin and simplePlugin we should find a way to avoid doing a separate LDAP fetch for this */
       $this->entryCSN = getEntryCSN($this->dn);
     }
 
@@ -156,9 +293,47 @@ class simplePlugin extends plugin
     }
   }
 
+  protected function loadAttributes()
+  {
+    // We load attributes values
+    // First the one flagged as preInit
+    foreach ($this->preInitAttributes as $attr) {
+      $this->attributesAccess[$attr]->setParent($this);
+      $this->attributesAccess[$attr]->loadValue($this->attrs);
+    }
+    // Then the others
+    foreach ($this->attributesInfo as &$sectionInfo) {
+      foreach ($sectionInfo['attrs'] as $name => &$attr) {
+        if (in_array($name, $this->preInitAttributes)) {
+          /* skip the preInit ones */
+          continue;
+        }
+        $attr->setParent($this);
+        $attr->loadValue($this->attrs);
+      }
+      unset($attr);
+    }
+    unset($sectionInfo);
+  }
+
+  function is_this_account($attrs)
+  {
+    $found = TRUE;
+    foreach ($this->objectclasses as $obj) {
+      if (preg_match('/top/i', $obj)) {
+        continue;
+      }
+      if (!isset($attrs['objectClass']) || !in_array_ics ($obj, $attrs['objectClass'])) {
+        $found = FALSE;
+        break;
+      }
+    }
+    return $found;
+  }
+
   function setTemplate ($bool)
   {
-    parent::setTemplate($bool);
+    $this->is_template = $bool;
     if ($this->is_template && $this->mainTab) {
       /* Unshift special section for template infos */
       $this->attributesInfo = array_merge(
@@ -190,32 +365,49 @@ class simplePlugin extends plugin
     }
   }
 
-  protected function loadAttributes()
+  protected function templateLoadAttrs(array $template_attrs)
   {
-    // We load attributes values
-    // First the one flagged as preInit
-    foreach ($this->preInitAttributes as $attr) {
-      $this->attributesAccess[$attr]->setParent($this);
-      $this->attributesAccess[$attr]->loadValue($this->attrs);
+    if ($this->mainTab) {
+      $this->_template_cn = $template_attrs['cn'][0];
     }
-    // Then the others
-    foreach ($this->attributesInfo as &$sectionInfo) {
-      foreach ($sectionInfo['attrs'] as $name => &$attr) {
-        if (in_array($name, $this->preInitAttributes)) {
-          /* skip the preInit ones */
-          continue;
-        }
-        $attr->setParent($this);
-        $attr->loadValue($this->attrs);
+    $this->attrs = templateHandling::fieldsFromLDAP($template_attrs);
+  }
+
+  protected function templateSaveAttrs()
+  {
+    global $config;
+    $ldap = $config->get_ldap_link();
+    $ldap->cat($this->dn);
+    $template_attrs = $ldap->fetch();
+    if (!$template_attrs) {
+      if (!$this->mainTab) {
+        trigger_error('It seems main tab has not been saved.');
       }
-      unset($attr);
+      $template_attrs = array(
+        'objectClass'     => array('fdTemplate'),
+        'fdTemplateField' => array()
+      );
     }
-    unset($sectionInfo);
+    $template_attrs = templateHandling::fieldsToLDAP($template_attrs, $this->attrs);
+    if ($this->mainTab) {
+      $template_attrs['cn'] = $this->_template_cn;
+    }
+    return $template_attrs;
+  }
 
-    $this->updateAttributesValues();
+  /*! \brief This function returns an LDAP filter for this plugin object classes
+   */
+  function getObjectClassFilter ()
+  {
+    if (!empty($this->objectclasses)) {
+      return '(&(objectClass='.implode(')(objectClass=', $this->objectclasses).'))';
+    } else {
+      return '';
+    }
   }
 
   /*! \brief This function allows to use the syntax $plugin->attributeName to get attributes values
+   *
    * It calls the getValue method on the concerned attribute
    * It also adds the $plugin->attribtues syntax to get attributes list
    */
@@ -243,7 +435,9 @@ class simplePlugin extends plugin
    */
   public function __set($name, $value)
   {
-    if (isset($this->attributesAccess[$name])) {
+    if ($name == 'attributes') {
+      trigger_error('Tried to set obsolete attribute "attributes" (it is now dynamic)');
+    } elseif (isset($this->attributesAccess[$name])) {
       $this->attributesAccess[$name]->setValue($value);
     } else {
       /* Calling default behaviour */
@@ -309,6 +503,127 @@ class simplePlugin extends plugin
     return $attr.'='.ldap_escape_dn($this->attributesAccess[$attr]->computeLdapValue()).','.$ou.$base;
   }
 
+  protected function addAttribute($section, $attr)
+  {
+    $name = $attr->getLdapName();
+    $this->attributesInfo[$section]['attrs'][$name] = $attr;
+    $this->attributesAccess[$name] =& $this->attributesInfo[$section]['attrs'][$name];
+    $this->attributesAccess[$name]->setParent($this);
+    unset($this->$name);
+  }
+
+  protected function removeAttribute($section, $id)
+  {
+    unset($this->attributesInfo[$section]['attrs'][$id]);
+    unset($this->attributesAccess[$id]);
+  }
+
+  /*!
+   * \brief Returns a list of all available departments for this object.
+   *
+   * If this object is new, all departments we are allowed to create a new object in are returned.
+   * If this is an existing object, return all deps we are allowed to move this object to.
+   * Used by BaseSelectorAttribute
+   *
+   * \return array [dn] => "..name"  // All deps. we are allowed to act on.
+  */
+  function get_allowed_bases()
+  {
+    global $config;
+    $deps = array();
+
+    /* Is this a new object ? Or just an edited existing object */
+    if (!$this->initially_was_account && $this->is_account) {
+      $new = TRUE;
+    } else {
+      $new = FALSE;
+    }
+
+    foreach ($config->idepartments as $dn => $name) {
+      if ($new && $this->acl_is_createable($dn)) {
+        $deps[$dn] = $name;
+      } elseif (!$new && $this->acl_is_moveable($dn)) {
+        $deps[$dn] = $name;
+      }
+    }
+
+    /* Add current base */
+    if (isset($this->base) && isset($config->idepartments[$this->base])) {
+      $deps[$this->base] = $config->idepartments[$this->base];
+    } elseif (strtolower($this->dn) != strtolower($config->current['BASE'])) {
+      trigger_error('Cannot return list of departments, no default base found in class '.get_class($this).'. (base is "'.$this->base.'")');
+    }
+    return $deps;
+  }
+
+  /*!
+   * \brief Set acl base
+   *
+   * \param string $base
+   */
+  function set_acl_base($base)
+  {
+    $this->acl_base = $base;
+  }
+
+  /*!
+   * \brief Set acl category
+   *
+   * \param string $category
+   */
+  function set_acl_category($category)
+  {
+    $this->acl_category = "$category/";
+  }
+
+  /*!
+    * \brief Move ldap entries from one place to another
+    *
+    * \param  string  $src_dn the source DN.
+    *
+    * \param  string  $dst_dn the destination DN.
+    */
+  function move($src_dn, $dst_dn)
+  {
+    global $config, $ui;
+
+    /* Do not move if only case has changed */
+    if (strtolower($src_dn) == strtolower($dst_dn)) {
+      return TRUE;
+    }
+
+    /* Try to move with ldap routines */
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $dst_dn));
+    if (!$ldap->rename_dn($src_dn, $dst_dn)) {
+      logging::log('debug', 'Ldap Protocol v3 implementation error, ldap_rename failed.',
+        "FROM: $src_dn  -- TO: $dst_dn", array(), $ldap->get_error());
+      @DEBUG(DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__, "Rename failed FROM: $src_dn  -- TO:  $dst_dn",
+        'Ldap Protocol v3 implementation error. Error:'.$ldap->get_error());
+      return FALSE;
+    }
+
+    /* Update userinfo if necessary */
+    if (preg_match('/'.preg_quote($src_dn, '/').'$/i', $ui->dn)) {
+      $ui_dn = preg_replace('/'.preg_quote($src_dn, '/').'$/i', $dst_dn, $ui->dn);
+      logging::log('view', 'acl/'.get_class($this), $this->dn, array(), 'Updated userinfo dn from "'.$ui->dn.'" to "'.$ui_dn.'"');
+      $ui->dn = $ui_dn;
+    }
+
+    /* Check if departments were moved. If so, force the reload of config->departments */
+    $ldap->cd($dst_dn);
+    $ldap->search('(objectClass=gosaDepartment)', array('dn'));
+    if ($ldap->count()) {
+      $config->get_departments();
+      $config->make_idepartments();
+      $ui->reset_acl_cache();
+    }
+
+    $this->handleForeignKeys($src_dn, $dst_dn);
+    return TRUE;
+  }
+
   function getRequiredAttributes()
   {
     $tmp = array();
@@ -320,18 +635,6 @@ class simplePlugin extends plugin
     return $tmp;
   }
 
-  /*! \brief This function update the values of LDAP attributes as class attribute,
-    so that plugin code works correctly
-
-    This should be removed once plugin class is not used anymore
-   */
-  function updateAttributesValues ()
-  {
-    unset($this->attributes);
-    /* This will call __get with attributes, which will create the array */
-    $this->attributes = $this->attributes;
-  }
-
   function editing_group ()
   {
     if ($this->editing_group == NULL) {
@@ -344,12 +647,23 @@ class simplePlugin extends plugin
     return $this->editing_group;
   }
 
+  /*! \brief Indicates if this object is opened as read-only (because of locks) */
+  function readOnly()
+  {
+    return $this->read_only;
+  }
+
   /*! \brief This function display the plugin and return the html code
    */
   function execute ()
   {
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "execute");
-    parent::execute();
+
+    /* Reset Lock message POST/GET check array, to prevent preg_match errors */
+    session::set('LOCK_VARS_TO_USE', array());
+    session::set('LOCK_VARS_USED_GET', array());
+    session::set('LOCK_VARS_USED_POST', array());
+    session::set('LOCK_VARS_USED_REQUEST', array());
 
     $this->displayPlugin  = TRUE;
     $this->header         = "";
@@ -369,9 +683,10 @@ class simplePlugin extends plugin
       /* Show tab dialog headers */
       $plInfo = pluglist::pluginInfos(get_class($this));
       if ($this->parent !== NULL) {
+        $disabled   = $this->acl_skip_write();
+        $depends    = array();
+        $conflicts  = array();
         if ($this->is_account) {
-          $disabled = $this->acl_skip_write();
-          $depends = array();
           if (isset($plInfo['plDepending'])) {
             foreach ($plInfo['plDepending'] as $plugin) {
               if (isset($this->parent->by_object[$plugin]) &&
@@ -382,15 +697,14 @@ class simplePlugin extends plugin
               }
             }
           }
-          $this->header = $this->show_disable_header(
+          $this->header = $this->show_header(
             msgPool::removeFeaturesButton($plInfo['plShortName']),
             msgPool::featuresEnabled($plInfo['plShortName'], $depends),
+            $this->is_account,
             $disabled,
             get_class($this).'_modify_state'
           );
         } else {
-          $disabled = $this->acl_skip_write();
-          $depends = array();
           if (isset($plInfo['plDepends'])) {
             foreach ($plInfo['plDepends'] as $plugin) {
               if (!isset($this->parent->by_object[$plugin]) ||
@@ -401,9 +715,20 @@ class simplePlugin extends plugin
               }
             }
           }
-          $this->header = $this->show_enable_header(
+          if (isset($plInfo['plConflicts'])) {
+            foreach ($plInfo['plConflicts'] as $plugin) {
+              if (isset($this->parent->by_object[$plugin]) &&
+                  $this->parent->by_object[$plugin]->is_account) {
+                $disabled   = TRUE;
+                $conflictPlInfos  = pluglist::pluginInfos($plugin);
+                $conflicts[]      = $conflictPlInfos['plShortName'];
+              }
+            }
+          }
+          $this->header = $this->show_header(
             msgPool::addFeaturesButton($plInfo['plShortName']),
-            msgPool::featuresDisabled($plInfo['plShortName'], $depends),
+            msgPool::featuresDisabled($plInfo['plShortName'], $depends, $conflicts),
+            $this->is_account,
             $disabled,
             get_class($this).'_modify_state'
           );
@@ -433,6 +758,30 @@ class simplePlugin extends plugin
     return $this->header.$smarty->fetch($this->templatePath);
   }
 
+  /*!
+   * \brief Show header message for tab dialogs
+   *
+   * \param string $button_text The button text
+   *
+   * \param string $text The text
+   *
+   * \param boolean $plugin_enabled
+   *
+   * \param boolean $button_disabled FALSE
+   */
+  function show_header($button_text, $text, $plugin_enabled, $button_disabled = FALSE, $name = 'modify_state')
+  {
+    if ($button_disabled || ((!$this->acl_is_createable() && !$plugin_enabled) || (!$this->acl_is_removeable() && $plugin_enabled))) {
+        $state = 'disabled="disabled"';
+    } else {
+        $state = '';
+    }
+    $display = '<div width="100%"><p><b>'.$text.'</b><br/>'."\n";
+    $display .= '<input type="submit" value="'.$button_text.'" name="'.$name.'" '.$state.'></p></div><hr class="separator"/>';
+
+    return $display;
+  }
+
   /*! \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)
@@ -491,7 +840,7 @@ class simplePlugin extends plugin
       foreach ($sectionInfo['attrs'] as $attr) {
         if ($attr->getAclInfo() !== FALSE) {
           // We assign ACLs so that attributes can use them in their template code
-          $smarty->assign($attr->getAcl()."ACL", $this->getacl($attr->getAcl(), $this->acl_skip_write()));
+          $smarty->assign($attr->getAcl()."ACL", $this->aclGetPermissions($attr->getAcl(), NULL, $this->acl_skip_write()));
         }
         $attr->renderAttribute($attributes, $readOnly);
       }
@@ -550,6 +899,63 @@ class simplePlugin extends plugin
     return ($this->needEditMode && !session::is_set('edit'));
   }
 
+  /*! \brief Can we write the attribute */
+  function acl_is_writeable($attribute, $skipWrite = FALSE)
+  {
+    return preg_match('/w/', $this->aclGetPermissions($attribute, NULL, $skipWrite));
+  }
+
+  /*!
+   * \brief Can we read the acl
+   *
+   * \param string $attribute
+   */
+  function acl_is_readable($attribute)
+  {
+    return preg_match('/r/', $this->aclGetPermissions($attribute));
+  }
+
+  /*!
+   * \brief Can we create the object
+   *
+   * \param string $base Empty string
+   */
+  function acl_is_createable($base = NULL)
+  {
+    return preg_match('/c/', $this->aclGetPermissions('0', $base));
+  }
+
+  /*!
+   * \brief Can we delete the object
+   *
+   * \param string $base Empty string
+   */
+  function acl_is_removeable($base = NULL)
+  {
+    return preg_match('/d/', $this->aclGetPermissions('0', $base));
+  }
+
+  /*!
+   * \brief Can we move the object
+   *
+   * \param string $base Empty string
+   */
+  function acl_is_moveable($base = NULL)
+  {
+    return preg_match('/m/', $this->aclGetPermissions('0', $base));
+  }
+
+  /*! \brief Get the acl permissions for an attribute or the plugin itself */
+  function aclGetPermissions($attribute = '0', $base = NULL, $skipWrite = FALSE)
+  {
+    $ui         = get_userinfo();
+    $skipWrite  |= $this->readOnly();
+    if ($base === NULL) {
+      $base = $this->acl_base;
+    }
+    return $ui->get_permissions($base, $this->acl_category.get_class($this), $attribute, $skipWrite);
+  }
+
   /*! \brief This function removes the object from LDAP
    */
   function remove_from_parent()
@@ -562,15 +968,63 @@ class simplePlugin extends plugin
       $this->attrs = $this->templateSaveAttrs();
       $this->saved_attributes = array();
     }
-    if ($this->ldap_remove()) {
-      $this->post_remove();
+    /* Pre hooks */
+    $errors = $this->pre_remove();
+    if (!empty($errors)) {
+      return $errors;
+    }
+    $errors = $this->ldap_remove();
+    if (!empty($errors)) {
+      return $errors;
     }
+    $this->post_remove();
+    return;
   }
 
+  /* Remove FusionDirectory attributes */
   protected function prepare_remove ()
   {
-    /* Remove FusionDirectory attributes */
-    plugin::remove_from_parent();
+    global $config;
+    $this->attrs = array();
+
+    if (!$this->mainTab) {
+      /* include global link_info */
+      $ldap = $config->get_ldap_link();
+
+      /* Get current objectClasses in order to add the required ones */
+      $ldap->cat($this->dn);
+      $tmp  = $ldap->fetch ();
+      $oc   = array();
+      if ($this->is_template) {
+        if (isset($tmp['fdTemplateField'])) {
+          foreach ($tmp['fdTemplateField'] as $tpl_field) {
+            if (preg_match('/^objectClass:(.+)$/', $tpl_field, $m)) {
+              $oc[] = $m[1];
+            }
+          }
+        }
+      } else {
+        if (isset($tmp['objectClass'])) {
+          $oc = $tmp['objectClass'];
+          unset($oc['count']);
+        }
+      }
+
+      /* Remove objectClasses from entry */
+      $this->attrs['objectClass'] = array_remove_entries_ics($this->objectclasses, $oc);
+
+      /* Unset attributes from entry */
+      foreach ($this->attributes as $val) {
+        $this->attrs["$val"] = array();
+      }
+    }
+  }
+
+  protected function pre_remove ()
+  {
+    if ($this->initially_was_account) {
+      return $this->handle_pre_events('remove');
+    }
   }
 
   protected function ldap_remove ()
@@ -584,14 +1038,12 @@ class simplePlugin extends plugin
       $ldap->cd($this->dn);
       $ldap->modify($this->attrs);
     }
-
     $this->ldap_error = $ldap->get_error();
 
     if ($ldap->success()) {
-      return TRUE;
+      return array();
     } else {
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()), LDAP_ERROR);
-      return FALSE;
+      return msgPool::ldaperror($this->ldap_error, $this->dn, LDAP_MOD, get_class());
     }
   }
 
@@ -600,14 +1052,17 @@ class simplePlugin extends plugin
     logging::log('remove', 'plugin/'.get_class($this), $this->dn, array_keys($this->attrs), $this->ldap_error);
 
     /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
+    $errors = $this->handle_post_events('remove');
+    if (!empty($errors)) {
+      msg_dialog::displayChecks($errors);
+    }
   }
 
   /*! \brief This function handle $_POST informations
    */
   function save_object ()
   {
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "save_object");
+    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'save_object');
     if ($this->displayHeader && isset($_POST[get_class($this).'_modify_state'])) {
       if ($this->is_account && $this->acl_is_removeable()) {
         $this->is_account = FALSE;
@@ -615,7 +1070,7 @@ class simplePlugin extends plugin
         $this->is_account = TRUE;
       }
     }
-    if (isset($_POST[get_class($this)."_posted"])) {
+    if (isset($_POST[get_class($this).'_posted'])) {
       // If our form has been posted
       // A first pass that loads the post values
       foreach ($this->attributesInfo as $section => &$sectionInfo) {
@@ -639,28 +1094,174 @@ class simplePlugin extends plugin
         unset ($attrs);
       }
       unset($sectionInfo);
-      $this->updateAttributesValues();
     }
   }
 
-  /*! \brief This function saves the object in the LDAP
-   */
-  function save ()
+  protected function prepareSavedAttributes()
   {
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "save");
+    /* Prepare saved attributes */
+    $this->saved_attributes = $this->attrs;
+    foreach (array_keys($this->saved_attributes) as $index) {
+      if (is_numeric($index)) {
+        unset($this->saved_attributes[$index]);
+        continue;
+      }
+
+      if (!in_array_ics($index, $this->attributes) && strcasecmp('objectClass', $index)) {
+        unset($this->saved_attributes[$index]);
+        continue;
+      }
+
+      if (isset($this->saved_attributes[$index][0])) {
+        if (!isset($this->saved_attributes[$index]['count'])) {
+          $this->saved_attributes[$index]['count'] = count($this->saved_attributes[$index]);
+        }
+        if ($this->saved_attributes[$index]['count'] == 1) {
+          $tmp = $this->saved_attributes[$index][0];
+          unset($this->saved_attributes[$index]);
+          $this->saved_attributes[$index] = $tmp;
+          continue;
+        }
+      }
+      unset($this->saved_attributes[$index]['count']);
+    }
+  }
+
+  /*!
+   * \brief Remove attributes, empty arrays, arrays
+   * single attributes that do not differ
+   */
+  function cleanup()
+  {
+    foreach ($this->attrs as $index => $value) {
+
+      /* 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 &&
+          isset($this->saved_attributes[$index]) &&
+          !is_array($this->saved_attributes[$index])) {
+        $this->attrs[$index] = $this->attrs[$index][0];
+      }
+
+      /* Remove emtpy arrays if they do not differ */
+      if (is_array($this->attrs[$index]) &&
+          count($this->attrs[$index]) == 0 &&
+          !isset($this->saved_attributes[$index])) {
+        unset ($this->attrs[$index]);
+        continue;
+      }
+
+      /* Remove single attributes that do not differ */
+      if (!is_array($this->attrs[$index]) &&
+          isset($this->saved_attributes[$index]) &&
+          !is_array($this->saved_attributes[$index]) &&
+          $this->attrs[$index] == $this->saved_attributes[$index]) {
+        unset ($this->attrs[$index]);
+        continue;
+      }
+
+      /* Remove arrays that do not differ */
+      if (is_array($this->attrs[$index]) &&
+          isset($this->saved_attributes[$index]) &&
+          is_array($this->saved_attributes[$index])) {
+        if (!array_differs($this->attrs[$index], $this->saved_attributes[$index])) {
+          unset ($this->attrs[$index]);
+          continue;
+        }
+      }
+    }
+  }
+
+  function prepareNextCleanup()
+  {
+    /* Update saved attributes and ensure that next cleanups will be successful too */
+    foreach ($this->attrs as $name => $value) {
+      $this->saved_attributes[$name] = $value;
+    }
+  }
+
+  /*! \brief This function saves the object in the LDAP
+   */
+  function save ()
+  {
+    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, "save");
     $this->prepare_save();
     if ($this->is_template && (!defined('_OLD_TEMPLATES_') || !_OLD_TEMPLATES_)) {
+      $errors = templateHandling::checkFields($this->attrs);
+      if (!empty($errors)) {
+        return $errors;
+      }
       $this->attrs = $this->templateSaveAttrs();
       $this->saved_attributes = array();
     }
-    $this->ldap_save();
+    $this->cleanup();
+    if (!$this->shouldSave()) {
+      return; /* Nothing to do here */
+    }
+    /* Pre hooks */
+    $errors = $this->pre_save();
+    if (!empty($errors)) {
+      return $errors;
+    }
+    /* LDAP save itself */
+    $errors = $this->ldap_save();
+    if (!empty($errors)) {
+      return $errors;
+    }
+    $this->prepareNextCleanup();
+    /* Post hooks and logging */
     $this->post_save();
+    return;
+  }
+
+  protected function shouldSave()
+  {
+    if ($this->mainTab && !$this->initially_was_account) {
+      return TRUE;
+    }
+    return !empty($this->attrs);
+  }
+
+  /* Used by prepare_save and template::apply */
+  public function mergeObjectClasses(array $oc)
+  {
+    return array_merge_unique($oc, $this->objectclasses);
   }
 
   protected function prepare_save ()
   {
-    /* Call parents save to prepare $this->attrs */
-    parent::save();
+    global $config;
+    /* prepare $this->attrs */
+    $ldap = $config->get_ldap_link();
+
+    $this->entryCSN = '';
+
+    /* Start with empty array */
+    $this->attrs = array();
+
+    /* Get current objectClasses in order to add the required ones */
+    $ldap->cat($this->dn, array('fdTemplateField', 'objectClass'));
+
+    $tmp  = $ldap->fetch();
+    $oc   = array();
+
+    if ($this->is_template) {
+      if (isset($tmp['fdTemplateField'])) {
+        foreach ($tmp['fdTemplateField'] as $tpl_field) {
+          if (preg_match('/^objectClass:(.+)$/', $tpl_field, $m)) {
+            $oc[] = $m[1];
+          }
+        }
+      }
+    } else {
+      if (isset($tmp['objectClass'])) {
+        $oc = $tmp['objectClass'];
+        unset($oc['count']);
+      }
+    }
+
+    $this->attrs['objectClass'] = $this->mergeObjectClasses($oc);
 
     /* Fill attributes LDAP values into the attrs array */
     foreach ($this->attributesInfo as $section => $sectionInfo) {
@@ -676,39 +1277,46 @@ class simplePlugin extends plugin
     }
   }
 
-  protected function ldap_save ($cleanup = TRUE)
+  protected function pre_save ()
+  {
+    if ($this->initially_was_account) {
+      return $this->handle_pre_events('modify');
+    } else {
+      return $this->handle_pre_events('add');
+    }
+  }
+
+  /* Returns an array with the errors or an empty array */
+  protected function ldap_save ()
   {
     global $config;
+
     /* Check if this is a new entry ... add/modify */
     $ldap = $config->get_ldap_link();
     $ldap->cat($this->dn, array("objectClass"));
     if ($this->mainTab && !$this->initially_was_account) {
       if ($ldap->count()) {
-        msg_dialog::display(_("Error when saving"), sprintf(_('There is already an entry with the same dn : %s'), $this->dn), ERROR_DIALOG);
-        return;
+        return array(sprintf(_('There is already an entry with the same dn : %s'), $this->dn));
       }
       $ldap->cd($config->current['BASE']);
       $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
       $action = "add";
     } else {
       if (!$ldap->count()) {
-        msg_dialog::display(_("Error when saving"), sprintf(_('The entry %s is not existing'), $this->dn), ERROR_DIALOG);
-        return;
+        return array(sprintf(_('The entry %s is not existing'), $this->dn));
       }
       $action = "modify";
     }
 
-    if ($cleanup) {
-      $this->cleanup();
-    }
     $ldap->cd($this->dn);
     $ldap->$action($this->attrs);
     $this->ldap_error = $ldap->get_error();
 
     /* Check for errors */
     if (!$ldap->success()) {
-      msg_dialog::display(_("LDAP error while $action"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()), LDAP_ERROR);
+      return array(msgPool::ldaperror($this->ldap_error, $this->dn, 0, get_class()));
     }
+    return array();
   }
 
   /*! \brief This function is called after LDAP save to do some post operations and logging
@@ -719,12 +1327,137 @@ class simplePlugin extends plugin
   {
     /* Propagate and log the event */
     if ($this->initially_was_account) {
-      $this->handle_post_events('modify');
+      $errors = $this->handle_post_events('modify');
       logging::log('modify', 'plugin/'.get_class($this), $this->dn, array_keys($this->attrs), $this->ldap_error);
     } else {
-      $this->handle_post_events('add');
+      $errors = $this->handle_post_events('add');
       logging::log('create', 'plugin/'.get_class($this), $this->dn, array_keys($this->attrs), $this->ldap_error);
     }
+    if (!empty($errors)) {
+      msg_dialog::displayChecks($errors);
+    }
+  }
+
+  /*! \brief Forward command execution requests
+   *         to the pre/post hook execution method.
+   *
+   * \param  string  $when must be PRE or POST
+   *
+   * \param  string  $mode add, remove or modify
+   *
+   * \param  array  $addAttrs
+   */
+  protected function handle_hooks($when, $mode, array $addAttrs = array())
+  {
+    switch ($mode) {
+      case 'add':
+        return $this->callHook($when.'CREATE', $addAttrs);
+
+      case 'modify':
+        return $this->callHook($when.'MODIFY', $addAttrs);
+
+      case 'remove':
+        return $this->callHook($when.'REMOVE', $addAttrs);
+
+      default:
+        trigger_error(sprintf('Invalid %s event type given: "%s"! Valid types are: add, modify, remove.', strtolower($when), $mode));
+        break;
+    }
+  }
+
+  /*! \brief Forward command execution requests
+   *         to the post hook execution method.
+   */
+  function handle_post_events($mode, array $addAttrs = array())
+  {
+    /* Update foreign keys */
+    if ($mode == 'remove') {
+      $this->handleForeignKeys($this->dn, NULL);
+    } elseif ($mode == 'modify') {
+      $this->handleForeignKeys();
+    }
+    return $this->handle_hooks('POST', $mode, $addAttrs);
+  }
+
+  /*!
+   *  \brief Forward command execution requests
+   *         to the pre hook execution method.
+   */
+  function handle_pre_events($mode, array $addAttrs = array())
+  {
+    $this->ldap_error = '';
+    return $this->handle_hooks('PRE', $mode, $addAttrs);
+  }
+
+  /*!
+   * \brief    Calls external hooks which are defined for this plugin (fusiondirectory.conf)
+   *           Replaces placeholder by class values of this plugin instance.
+   *       Allows to a add special replacements.
+   */
+  function callHook($cmd, array $addAttrs = array(), &$returnOutput = array(), &$returnCode = NULL)
+  {
+    if ($this->is_template) {
+      return array();
+    }
+    global $config;
+
+    $commands = $config->searchHooks(get_class($this), $cmd);
+    $messages = array();
+
+    foreach ($commands as $command) {
+      // Walk trough attributes list and add the plugins attributes.
+      foreach ($this->attributes as $attr) {
+        $addAttrs[$attr] = $this->$attr;
+      }
+
+      $ui = get_userinfo();
+
+      $addAttrs['callerDN']         = $ui->dn;
+      $addAttrs['callerCN']         = $ui->cn;
+      $addAttrs['callerUID']        = $ui->uid;
+      $addAttrs['callerSN']         = $ui->sn;
+      $addAttrs['callerGIVENNAME']  = $ui->givenName;
+
+      $addAttrs['dn']         = $this->dn;
+      $addAttrs['location']   = $config->current['NAME'];
+
+      if (isset($this->parent->by_object)) {
+        foreach ($this->parent->by_object as $object) {
+          foreach ($object->attributes as $attr) {
+            if (!isset($addAttrs[$attr])) {
+              $addAttrs[$attr] = $object->$attr;
+            }
+          }
+        }
+      }
+
+      if (!isset($addAttrs['base']) && isset($this->base)) {
+        $addAttrs['base'] = $this->base;
+      }
+
+      $command = templateHandling::parseString($command, $addAttrs, 'escapeshellarg');
+
+      @DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
+      exec($command, $arr, $returnCode);
+      $returnOutput = $arr;
+
+      if ($returnCode != 0) {
+        $str = implode("\n", $arr);
+        @DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execution failed code: ".$returnCode);
+        $message = msgPool::cmdexecfailed($cmd, $command, get_class($this));
+        if (!empty($str)) {
+          $message .= "Result: ".$str;
+        }
+        $messages[] = $message;
+      } elseif (is_array($arr)) {
+        $str = implode("\n", $arr);
+        @DEBUG(DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Result: ".$str);
+        if (!empty($str) && $config->get_cfg_value("displayHookOutput", "FALSE") == "TRUE") {
+          msg_dialog::display('['.get_class($this).' '.strtolower($cmd)."hook] $command", $str, INFO_DIALOG);
+        }
+      }
+    }
+    return $messages;
   }
 
   /*! \brief This function checks the attributes values and yell if something is wrong
@@ -732,24 +1465,27 @@ class simplePlugin extends plugin
   function check ()
   {
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'check');
-    $message = array();
+    $messages = array();
 
     foreach ($this->attributesInfo as $sectionInfo) {
       foreach ($sectionInfo['attrs'] as $attr) {
         $error = $attr->check();
         if (!empty($error)) {
           if (is_array($error)) {
-            $message = array_merge($message, $error);
+            $messages = array_merge($messages, $error);
           } else {
-            $message[] = $error;
+            $messages[] = $error;
           }
         }
       }
     }
 
-    $this->callHook('CHECK', array('nbCheckErrors' => count($message)), $returnOutput);
+    $error = $this->callHook('CHECK', array('nbCheckErrors' => count($messages)), $returnOutput);
+    if (!empty($error)) {
+      $messages = array_merge($messages, $error);
+    }
     if (!empty($returnOutput)) {
-      $message[] = join("\n", $returnOutput);
+      $messages[] = join("\n", $returnOutput);
     }
 
     /* Check entryCSN */
@@ -757,11 +1493,373 @@ class simplePlugin extends plugin
       $current_csn = getEntryCSN($this->dn);
       if (($current_csn != $this->entryCSN) && !empty($current_csn)) {
         $this->entryCSN = $current_csn;
-        $message[] = _('The object has changed since opened in FusionDirectory. All changes that may be done by others will get lost if you save this entry!');
+        $messages[] = _('The object has changed since opened in FusionDirectory. All changes that may be done by others will get lost if you save this entry!');
+      }
+    }
+
+    return $messages;
+  }
+
+  function handleForeignKeys ($olddn = NULL, $newdn = NULL, $mode = 'move')
+  {
+    if (($olddn !== NULL) && ($olddn == $newdn)) {
+      return;
+    }
+    if ($this->is_template) {
+      return;
+    }
+    $this->browseForeignKeys(
+      'handle_'.$mode,
+      $olddn,
+      $newdn
+    );
+  }
+
+  function browseForeignKeys($mode, $param1 = NULL, $param2 = NULL)
+  {
+    if (preg_match('/^handle_/', $mode)) {
+      $olddn    = $param1;
+      $newdn    = $param2;
+      $classes  = array(get_class($this));
+    } elseif ($mode == 'references') {
+      $classes = array_keys($this->parent->by_object);
+    }
+    // We group by objetType concerned
+    $foreignRefs = array();
+    foreach ($classes as $tabclass) {
+      $infos = pluglist::pluginInfos($tabclass);
+      foreach ($infos['plForeignRefs'] as $field => $refs) {
+        if (preg_match('/^handle_/', $mode)) {
+          if (($newdn !== NULL) && ($field != 'dn') && ($mode == 'handle_move')) {
+            // Move action, ignore other fields than dn
+            continue;
+          } elseif (($newdn === NULL) && ($olddn === NULL) && (($field == 'dn') || (!$this->attributeHaveChanged($field)))) {
+            // Edit action, ignore dn changes or attributes which did not change
+            continue;
+          }
+          // else = delete action, all fields are concerned, nothing to do here
+        }
+        foreach ($refs as $ref) {
+          $class  = $ref[0];
+          $ofield = $ref[1];
+          $filter = $ref[2];
+          $cinfos = pluglist::pluginInfos($class);
+          if (is_subclass_of($class, 'simpleService')) {
+            $objectTypes = array('server');
+          } else {
+            $objectTypes = $cinfos['plObjectType'];
+          }
+          foreach ($objectTypes as $key => $objectType) {
+            if (!is_numeric($key)) {
+              $objectType = $key;
+            }
+            if (preg_match('/^handle_/', $mode)) {
+              if ($field == 'dn') {
+                $oldvalue = $olddn;
+                $newvalue = $newdn;
+              } elseif (($olddn !== NULL) && ($newdn === NULL)) {
+                $oldvalue = $this->attributeInitialValue($field);
+                $newvalue = NULL;
+              } else {
+                $oldvalue = $this->attributeInitialValue($field);
+                $newvalue = $this->attributeValue($field);
+              }
+              $foreignRefs[$objectType]['refs'][$class][$ofield][$field] =
+                array(
+                  'tab'       => $tabclass,
+                  'field'     => $field,
+                  'oldvalue'  => $oldvalue,
+                  'newvalue'  => $newvalue,
+                );
+              $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,
+                  'field'   => $field,
+                  'tabname' => $this->parent->by_name[$tabclass],
+                  'value'   => $this->parent->by_object[$tabclass]->$field,
+                );
+              $filter = templateHandling::parseString($filter, array('oldvalue' => $this->parent->by_object[$tabclass]->$field), 'ldap_escape_f');
+            }
+            if (!preg_match('/^\(.*\)$/', $filter)) {
+              $filter = '('.$filter.')';
+            }
+            $foreignRefs[$objectType]['filters'][$filter] = $filter;
+          }
+        }
       }
     }
 
-    return $message;
+    /* Back up POST content */
+    $SAVED_POST = $_POST;
+    $refs = array();
+    // For each concerned objectType
+    foreach ($foreignRefs as $objectType => $tabRefs) {
+      // Compute filter
+      $filters = array_values($tabRefs['filters']);
+      $filter = '(|'.join($filters).')';
+      // Search objects
+      try {
+        $objects = objects::ls($objectType, array('dn' => 'raw'), NULL, $filter);
+      } catch (NonExistingObjectTypeException $e) {
+        continue;
+      } catch (EmptyFilterException $e) {
+        continue;
+      }
+      // For each object of this type
+      foreach (array_keys($objects) as $dn) {
+        /* Avoid sending POST to opened objects */
+        $_POST = array();
+        // Build the object
+        $tabobject = objects::open($dn, $objectType);
+        if (preg_match('/^handle_/', $mode)) {
+          // For each tab concerned
+          foreach ($tabRefs['refs'] as $tab => $fieldRefs) {
+            // If the tab is activated on this object
+            $pluginobject = $tabobject->getTabOrServiceObject($tab);
+            if ($pluginobject !== FALSE) {
+              // For each field
+              foreach ($fieldRefs as $ofield => $fields) {
+                foreach ($fields as $field) {
+                  // call plugin::foreignKeyUpdate(ldapname, oldvalue, newvalue, source) on the object
+                  $pluginobject->foreignKeyUpdate(
+                    $ofield,
+                    $field['oldvalue'],
+                    $field['newvalue'],
+                    array(
+                      'CLASS' => $field['tab'],
+                      'FIELD' => $field['field'],
+                      'MODE'  => preg_replace('/^handle_/', '', $mode),
+                      'DN'    => $this->dn,
+                    )
+                  );
+                }
+              }
+              $pluginobject->save_object();
+            }
+          }
+          $tabobject->save();
+        } elseif ($mode == 'references') {
+          // For each tab concerned
+          foreach ($tabRefs['refs'] as $tab => $tab_infos) {
+            // If the tab is activated on this object
+            $pluginobject = $tabobject->getTabOrServiceObject($tab);
+            if ($pluginobject !== FALSE) {
+              // For each field
+              foreach ($tab_infos['fields'] as $ofield => $fields) {
+                foreach ($fields as $field) {
+                  if ($pluginobject->foreignKeyCheck(
+                        $ofield,
+                        $field['value'],
+                        array(
+                          'CLASS' => $field['tab'],
+                          'FIELD' => $field['field'],
+                          'DN'    => $this->dn,
+                        )
+                      )) {
+                    if (!isset($refs[$dn])) {
+                      $refs[$dn] = array(
+                        'link'  => '',
+                        'tabs'  => array(),
+                      );
+                      try {
+                        $refs[$dn]['link'] = objects::link($dn, $objectType);
+                      } catch (FusionDirectoryException $e) {
+                        trigger_error("Could not create link to $dn: ".$e->getMessage());
+                        $refs[$dn]['link'] = $dn;
+                      }
+                    }
+                    if (!isset($refs[$dn]['tabs'][$tab])) {
+                      $refs[$dn]['tabs'][$tab] = array(
+                        'link'    => '',
+                        'fields'  => array(),
+                      );
+                      try {
+                        if (is_subclass_of($tab, 'simpleService')) {
+                          $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "service_$tab", sprintf(_('Service "%s"'), $tab_infos['name']));
+                        } else {
+                          $refs[$dn]['tabs'][$tab]['link'] = objects::link($dn, $objectType, "tab_$tab", sprintf(_('Tab "%s"'), $tab_infos['name']));
+                        }
+                      } catch (FusionDirectoryException $e) {
+                        trigger_error("Could not create link to $dn $tab: ".$e->getMessage());
+                        $refs[$dn]['tabs'][$tab]['link'] = $tab;
+                      }
+                    }
+                    $refs[$dn]['tabs'][$tab]['fields'][$ofield] = $field;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    /* Restore POST */
+    $_POST = $SAVED_POST;
+    if ($mode == 'references') {
+      return $refs;
+    }
+  }
+
+  /*!
+   * \brief Create unique DN
+   *
+   * \param string $attribute
+   *
+   * \param string $base
+   */
+  function create_unique_dn($attribute, $base)
+  {
+    global $config;
+    $ldap = $config->get_ldap_link();
+    $base = preg_replace('/^,*/', '', $base);
+
+    /* Try to use plain entry first */
+    $dn = $attribute.'='.ldap_escape_dn($this->$attribute).','.$base;
+    if ($dn == $this->orig_dn) {
+      return $dn;
+    }
+    $ldap->cat($dn, array('dn'));
+    if (!$ldap->fetch()) {
+      return $dn;
+    }
+
+    /* Look for additional attributes */
+    foreach ($this->attributes as $attr) {
+      if (($attr == $attribute) || ($this->$attr == '') || is_array($this->$attr)) {
+        continue;
+      }
+
+      $dn = $attribute.'='.ldap_escape_dn($this->$attribute).'+'.$attr.'='.ldap_escape_dn($this->$attr).','.$base;
+      if ($dn == $this->orig_dn) {
+        return $dn;
+      }
+      $ldap->cat($dn, array('dn'));
+      if (!$ldap->fetch()) {
+        return $dn;
+      }
+    }
+
+    /* None found */
+    return 'none';
+  }
+
+  /*
+   * \brief Adapt from template, using 'dn'
+   *
+   * \param string $dn The DN
+   *
+   * \param array $skip A new array
+   */
+  function adapt_from_template($attrs, $skip = array())
+  {
+    $this->attrs = $attrs;
+
+    /* Walk through attributes */
+    foreach ($this->attributesAccess as $ldapName => &$attr) {
+      /* Skip the ones in skip list */
+      if (in_array($ldapName, $skip)) {
+        continue;
+      }
+      /* Load values */
+      $attr->loadValue($this->attrs);
+    }
+    unset($attr);
+
+    /* Is Account? */
+    $this->is_account = $this->is_this_account($this->attrs);
+  }
+
+  /*!
+   * \brief This function is called on the copied object to set its dn to where it will be saved
+   */
+  function resetCopyInfos()
+  {
+    $this->dn       = 'new';
+    $this->orig_dn  = $this->dn;
+
+    $this->saved_attributes       = array();
+    $this->initially_was_account  = FALSE;
+  }
+
+  protected function attributeHaveChanged($field)
+  {
+    return $this->attributesAccess[$field]->hasChanged();
+  }
+
+  protected function attributeValue($field)
+  {
+    return $this->attributesAccess[$field]->getValue();
+  }
+
+  protected function attributeInitialValue($field)
+  {
+    return $this->attributesAccess[$field]->getInitialValue();
+  }
+
+  function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
+  {
+    if (!isset($source['MODE'])) {
+      $source['MODE'] = 'move';
+    }
+    $this->attributesAccess[$field]->foreignKeyUpdate($oldvalue, $newvalue, $source);
+  }
+
+  /*
+   * Source is an array like this:
+   * array(
+   *  'CLASS' => class,
+   *  'FIELD' => field,
+   *  'DN'    => dn,
+   *  'MODE'  => mode
+   * )
+   * mode being either 'copy' or 'move', defaults to 'move'
+   */
+  function foreignKeyCheck ($field, $value, $source)
+  {
+    return $this->attributesAccess[$field]->foreignKeyCheck($value, $source);
+  }
+
+  function deserializeValues($values, $checkAcl = TRUE)
+  {
+    foreach ($values as $name => $value) {
+      if (isset($this->attributesAccess[$name])) {
+        if (!$checkAcl || $this->attrIsWriteable($name)) {
+          $this->attributesAccess[$name]->setValue($value);
+        } else {
+          return msgPool::permModify($this->dn, $name);
+        }
+      } else {
+        return sprintf(_('Unknown field "%s"'), $name);
+      }
+    }
+    return TRUE;
+  }
+
+  /* Returns TRUE if this attribute should be asked in the creation by template dialog */
+  function showInTemplate($attr, $templateAttrs)
+  {
+    if (isset($templateAttrs[$attr])) {
+      return FALSE;
+    }
+    return TRUE;
+  }
+
+  function is_modal_dialog()
+  {
+    return (isset($this->dialog) && $this->dialog);
+  }
+
+  /*!
+   * \brief Return plugin informations for acl handling
+   *
+   * \return an array
+   */
+  static function plInfo()
+  {
+    return array();
   }
 
   /*! \brief This function generate the needed ACLs for a given attribtues array
@@ -783,17 +1881,6 @@ class simplePlugin extends plugin
     return $plProvidedAcls;
   }
 
-  /*! \brief This function is the needed main.inc for users tab
-   *
-   *  \param array $classname the plugin class name
-   */
-  static function userMainInc ($classname)
-  {
-    global $ui;
-    trigger_error("userMainInc is deprecated");
-    return static::mainInc($classname, $ui->dn);
-  }
-
   /*! \brief This function is the needed main.inc for plugins that are not used inside a management class
    *
    *  \param array $classname the class name to read plInfo from. (plIcon, plShortname and plCategory are gonna be used)
@@ -812,7 +1899,7 @@ class simplePlugin extends plugin
     global $remove_lock, $cleanup, $display, $config, $plug, $ui;
 
     $plInfo     = pluglist::pluginInfos($classname);
-    $plIcon     = (isset($plInfo['plIcon'])?$plInfo['plIcon']:'plugin.png');
+    $plIcon     = (isset($plInfo['plIcon']) ? $plInfo['plIcon'] : 'plugin.png');
     $plHeadline = $plInfo['plTitle'];
     if ($objectType === FALSE) {
       $key = key($plInfo['plObjectType']);
@@ -821,7 +1908,7 @@ class simplePlugin extends plugin
       }
       $objectType = $key;
     }
-    $plCategory = (isset($plInfo['plCategory'])?$plInfo['plCategory']:array('user'));
+    $plCategory = (isset($plInfo['plCategory']) ? $plInfo['plCategory'] : array('user'));
     $key = key($plCategory);
     if (is_numeric($key)) {
       $plCategory = $plCategory[$key];
@@ -896,11 +1983,10 @@ class simplePlugin extends plugin
         $info = "";
         if (isset($_POST['edit_finish'])) {
           /* Perform checks */
-          $message = $tabObject->check();
+          $message = $tabObject->save();
 
           /* No errors, save object */
           if (count($message) == 0) {
-            $tabObject->save();
             del_lock($entry_dn);
             session::un_set('edit');
 
@@ -962,94 +2048,5 @@ class simplePlugin extends plugin
       $display = print_header($plIcon, $plHeadline, $info).$display;
     }
   }
-
-  /*
-   * \brief Adapt from template, using 'dn'
-   *
-   * \param string $dn The DN
-   *
-   * \param array $skip A new array
-   */
-  function adapt_from_template($attrs, $skip = array())
-  {
-    $this->attrs = $attrs;
-
-    /* Walk through attributes */
-    foreach ($this->attributesAccess as $ldapName => &$attr) {
-      /* Skip the ones in skip list */
-      if (in_array($ldapName, $skip)) {
-        continue;
-      }
-      /* Load values */
-      $attr->loadValue($this->attrs);
-    }
-    unset($attr);
-
-    /* Is Account? */
-    $this->is_account = $this->is_this_account($this->attrs);
-  }
-
-  protected function attributeHaveChanged($field)
-  {
-    return $this->attributesAccess[$field]->hasChanged();
-  }
-
-  protected function attributeValue($field)
-  {
-    return $this->attributesAccess[$field]->getValue();
-  }
-
-  protected function attributeInitialValue($field)
-  {
-    return $this->attributesAccess[$field]->getInitialValue();
-  }
-
-  function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
-  {
-    if (!isset($source['MODE'])) {
-      $source['MODE'] = 'move';
-    }
-    $this->attributesAccess[$field]->foreignKeyUpdate($oldvalue, $newvalue, $source);
-  }
-
-  /*
-   * Source is an array like this:
-   * array(
-   *  'CLASS' => class,
-   *  'FIELD' => field,
-   *  'DN'    => dn,
-   *  'MODE'  => mode
-   * )
-   * mode being either 'copy' or 'move', defaults to 'move'
-   */
-  function foreignKeyCheck ($field, $value, $source)
-  {
-    return $this->attributesAccess[$field]->foreignKeyCheck($value, $source);
-  }
-
-  function deserializeValues($values, $checkAcl = TRUE) {
-    foreach ($values as $name => $value) {
-      if (isset($this->attributesAccess[$name])) {
-        if (!$checkAcl || $this->acl_is_writeable($this->attributesAccess[$name]->getAcl())) {
-          $this->attributesAccess[$name]->setValue($value);
-        } else {
-          return msgPool::permModify($this->dn, $name);
-        }
-      } else {
-        return sprintf(_('Unknown field "%s"'), $name);
-      }
-    }
-    return TRUE;
-  }
-
-  /* Returns TRUE if this attribute should be asked in the creation by template dialog */
-  function showInTemplate($attr, $templateAttrs)
-  {
-    if (isset($templateAttrs[$attr])) {
-      return FALSE;
-    }
-    return TRUE;
-  }
 }
-
 ?>
diff --git a/include/simpleplugin/class_simpleSelectManagement.inc b/include/simpleplugin/class_simpleSelectManagement.inc
index ced9c4104cf4461fb5a4dbc37a78fb1aa7aa5bb7..4f8aded09d10b517ee312a8e312f44ae1474158b 100644
--- a/include/simpleplugin/class_simpleSelectManagement.inc
+++ b/include/simpleplugin/class_simpleSelectManagement.inc
@@ -65,7 +65,6 @@ class simpleSelectManagement extends simpleManagement
 
   static function filterSelectLink()
   {
-    // TODO : replace this with javascript that select the line when multiSelect is TRUE
     if (func_num_args() < 4) {
       return '&nbsp';
     }
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index d14864cce3d298f8237a823ce312c8e1aa5f5a8e..eac23ff644bf384dc2e9ef327e3c424ca42e889d 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -35,6 +35,7 @@ class simpleTabs
 
   public    $objectType   = FALSE;
   protected $specialTabs  = TRUE;
+  protected $plNotify     = array();
 
   var $last       = "";
   var $current    = "";
@@ -46,61 +47,40 @@ class simpleTabs
   /* A parent object if available, e.g. a management class. */
   var $parent = NULL;
 
-  /* Used when the entry is opened as "readonly" due to locks. */
-  var $read_only = FALSE;
-
   var $baseclass = "";
 
   /*!
    * \brief Tabs classes constructor
-   *
-   * You should either call __construct($type, $dn, [$copied_object]) or (deprecated) __construct(NULL, $data, $dn, $category, [$copied_object])
    * */
-  function __construct()
+  function __construct($type, $dn, $attrs_object = NULL)
   {
     global $config;
-    $attrs_object = NULL;
-    if (is_string(func_get_arg(0))) {
-      $type   = func_get_arg(0);
-      $dn     = func_get_arg(1);
-      $infos  = objects::infos($type);
-
-      $data           = $config->data['TABS'][$infos['tabGroup']];
-      $acl_category   = $infos['aclCategory'];
-      if (func_num_args() >= 3) {
-        $attrs_object  = func_get_arg(2);
-      }
-      $this->objectType = $type;
-    } else {
-      //~ trigger_error('deprecated call to old tabclass constructor');
-      /* Deprecated, used by old management classes */
-      //$config_object  = func_get_arg(0); // ignored
-      $data           = func_get_arg(1);
-      $dn             = func_get_arg(2);
-      $acl_category   = func_get_arg(3);
-      if (func_num_args() >= 5) {
-        $attrs_object  = func_get_arg(4);
-      }
+
+    if (!is_string($type)) {
+      die('deprecated call to old tabclass constructor');
     }
 
-    /* Save dn */
-    $this->dn     = $dn;
+    $infos              = objects::infos($type);
+    $data               = $config->data['TABS'][$infos['tabGroup']];
+    $this->acl_category = $infos['aclCategory'];
+    $this->objectType   = $type;
+    $this->dn           = $dn;
 
     if (!count($data)) {
-      $data[] = array("CLASS" => 'plugin',"NAME" => 'Error');
-      msg_dialog::display(_("Error"),
-        sprintf(_("No plugin definitions found to initialize '%s', please check your configuration file."), get_class($this)),
+      $data[] = array('CLASS' => 'plugin','NAME' => 'Error');
+      msg_dialog::display(_('Error'),
+        sprintf(_('No plugin definitions found to initialize "%s", please check your configuration file.'), get_class($this)),
         ERROR_DIALOG);
     }
 
     $baseobject         = NULL;
-    $this->acl_category = $acl_category;
-    foreach ($data as &$tab) {
+    foreach ($data as $tab) {
       if (!plugin_available($tab['CLASS'])) {
         continue;
       }
 
-      $this->by_name[$tab['CLASS']] = $tab['NAME'];
+      $this->by_name[$tab['CLASS']]   = $tab['NAME'];
+      $this->plNotify[$tab['CLASS']]  = FALSE;
 
       if ($baseobject === NULL) {
         $baseobject = new $tab['CLASS']($this->dn, $attrs_object, $this, TRUE);
@@ -110,18 +90,18 @@ class simpleTabs
         $this->by_object[$tab['CLASS']] = new $tab['CLASS']($this->dn, $baseobject, $this, FALSE);
       }
 
-      $this->read_only |= $this->by_object[$tab['CLASS']]->read_only;
       $this->by_object[$tab['CLASS']]->set_acl_category($this->acl_category);
     }
-    unset($tab);
 
     /* Initialize current */
     $this->current = $this->baseclass;
 
-    $infos = $this->objectInfos();
-    if ($infos && $infos['mainAttr']) {
+    if ($infos['mainAttr']) {
       $baseobject = $this->getBaseObject();
-      if (($baseobject instanceof simplePlugin) && $baseobject->attributesAccess[$infos['mainAttr']]->getUnique() === FALSE) {
+      if (
+        ($baseobject instanceof simplePlugin) &&
+        ($baseobject->attributesAccess[$infos['mainAttr']]->getUnique() === FALSE)
+      ) {
         $baseobject->attributesAccess[$infos['mainAttr']]->setUnique(TRUE);
       }
     }
@@ -175,8 +155,8 @@ class simpleTabs
       } else {
         $baseobject->base = dn2base(get_userinfo()->dn);
       }
-      /* For some plugins not yet migrated to simple plugin. */
       if (!($baseobject instanceOf simplePlugin) && is_object($baseobject->baseSelector)) {
+        /* For some plugins not yet migrated to simple plugin. */
         $baseobject->baseSelector->setBase($baseobject->base);
       }
       @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $baseobject->base, 'Fixed base');
@@ -190,6 +170,12 @@ class simpleTabs
     return $this->by_object[$this->baseclass];
   }
 
+  /*! \brief Indicates if this tab class is read-only (because of locks) */
+  function readOnly()
+  {
+    return $this->getBaseObject()->readOnly();
+  }
+
   /*!
    * \brief Save the tab(s) contents
    */
@@ -281,7 +267,7 @@ class simpleTabs
 
       /* Take care about notifications */
       $obj = $this->by_object[$class];
-      if ($this->by_object[$class]->pl_notify && ($obj->is_account || $obj->ignore_account)) {
+      if ($this->plNotify[$class] && ($obj->is_account || $obj->ignore_account)) {
         $cssClasses .= ' tab-notify';
       }
       if ($disabled) {
@@ -315,18 +301,12 @@ class simpleTabs
    */
   function delete()
   {
-    /* Check if all plugins will ACK for deletion */
-    foreach (array_reverse($this->by_object) as $key => $obj) {
-      $reason = $obj->allow_remove();
-      if ($reason != "") {
-        msg_dialog::display(_("Warning"), sprintf(_("Delete process has been canceled by plugin '%s': %s"), $key, $reason), WARNING_DIALOG);
-        return;
-      }
-    }
-
     /* Delete for all plugins */
     foreach (array_reverse($this->by_object) as $obj) {
-      $obj->remove_from_parent();
+      $errors = $obj->remove_from_parent();
+      if (!empty($errors)) {
+        msg_dialog::displayChecks($errors);
+      }
     }
   }
 
@@ -335,7 +315,7 @@ class simpleTabs
    *
    * \param boolean $ignore_account false
    */
-  function check()
+  protected function check()
   {
     global $config;
     $messages = array();
@@ -356,27 +336,23 @@ class simpleTabs
     $current_set = FALSE;
 
     /* Check all plugins */
-    foreach ($this->by_object as $key => &$obj) {
+    foreach ($this->by_object as $key => $obj) {
+      $this->plNotify[$key] = FALSE;
       if (($obj->is_account || $obj->ignore_account) && (!$obj->is_template)) {
         @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Checking");
 
         $msg = $obj->check();
 
         if (count($msg)) {
-          $obj->pl_notify = TRUE;
+          $this->plNotify[$key] = TRUE;
           if (!$current_set) {
             $current_set    = TRUE;
             $this->current  = $key;
             $messages       = $msg;
           }
-        } else {
-          $obj->pl_notify = FALSE;
         }
-      } else {
-        $obj->pl_notify = FALSE;
       }
     }
-    unset($obj);
 
     return $messages;
   }
@@ -389,52 +365,77 @@ class simpleTabs
   function save()
   {
     global $ui;
+    $messages = $this->check();
+    if (!empty($messages)) {
+      return $messages;
+    }
 
     $baseobject = $this->getBaseObject();
+    $old_dn     = $this->dn;
     $new_dn     = $baseobject->compute_dn();
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $new_dn, "Saving");
 
+    $errors   = array();
+    $creation = ($this->dn == 'new');
+
     /* Move ? */
     if ($this->dn != $new_dn) {
       /* Write entry on new 'dn' */
-      if ($this->dn != 'new') {
+      if ($creation) {
+        /* use the new one */
+        $this->dn = $new_dn;
+      } else {
         if ($baseobject->move($this->dn, $new_dn)) {
           $this->dn = $new_dn;
         } else {
-          msg_dialog::display(_('Error'), sprintf(_('Move from "%s" to "%s" failed'), $this->dn, $new_dn), ERROR_DIALOG);
+          $errors[] = sprintf(_('Move from "%s" to "%s" failed'), $this->dn, $new_dn);
         }
-      } else {
-        /* use the new one */
-        $this->dn = $new_dn;
       }
     }
 
     /* Save all plugins */
-    foreach ($this->by_object as $key => &$obj) {
-      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Saving");
+    $first = TRUE;
+    foreach ($this->by_object as $key => $obj) {
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Saving');
 
       $obj->dn = $this->dn;
 
-      if (!$obj instanceof plugin && !$obj instanceOf management) {
-        trigger_error("Something went wrong while saving ".$obj->dn.". Object class '".get_class($obj)."'.");
+      if (!($obj instanceof simplePlugin) && !($obj instanceOf simpleManagement)) {
+        trigger_error('Something went wrong while saving '.$obj->dn.'. Class "'.get_class($obj).'".');
       } else {
         if ($obj->is_account || $obj->ignore_account) {
-          if ($obj->save() == 1) {
-            return 1;
-          }
+          $result = $obj->save();
         } else {
-          $obj->remove_from_parent();
+          $result = $obj->remove_from_parent();
+        }
+        if (!empty($result)) {
+          if ($creation && $first) {
+            /* If the fail of main tab fails for a creation, cancel the save of other tabs */
+            $this->dn = $old_dn;
+            $obj->dn  = $this->dn;
+            return $result;
+          }
+          $errors = array_merge($errors, $result);
         }
       }
+      if ($first) {
+        $first = FALSE;
+      }
     }
-    unset($obj);
 
-    if ($this->dn == $ui->dn) {
+    if (empty($errors) && ($this->dn == $ui->dn)) {
       /* If the logged in user was edited, update his information */
       $ui->loadLDAPInfo();
     }
 
-    return 0;
+    if (!empty($errors)) {
+      $this->dn = $old_dn;
+      foreach ($this->by_object as $obj) {
+        $obj->dn = $this->dn;
+      }
+    }
+
+    return $errors;
   }
 
   /*!
@@ -466,7 +467,8 @@ class simpleTabs
         continue;
       }
 
-      $this->by_name[$tab['CLASS']] = $tab['NAME'];
+      $this->by_name[$tab['CLASS']]   = $tab['NAME'];
+      $this->plNotify[$tab['CLASS']]  = FALSE;
       $this->by_object[$tab['CLASS']] = new $tab['CLASS']($this->dn, $baseobject, $this, FALSE);
       $this->by_object[$tab['CLASS']]->set_acl_category($this->acl_category);
     }
diff --git a/include/variables_common.inc b/include/variables_common.inc
index fc039148d6043f0dd818d30a1e46a95300d58aa7..6c8adaa4e79817b42025c851e37c41c54e25e261 100644
--- a/include/variables_common.inc
+++ b/include/variables_common.inc
@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
 /*!
  * \brief FusionDirectory Version
  */
-define ("FD_VERSION", "1.0.20"); /*! Define FusionDirectory version */
+define ("FD_VERSION", "1.1"); /*! Define FusionDirectory version */
 
 /*!
  * \brief FusionDirectory config object RDN
@@ -75,4 +75,9 @@ define ("CONFIGRDN", "cn=config,ou=fusiondirectory,"); /*! Define FusionDirector
  */
 define ("PHP_MIN_VERSION", "5.4.0");
 
+/*!
+ * \brief Toggle crashing on PHP error, used for test suites
+ */
+define ('PHP_ERROR_FATAL', 'FALSE');
+
 ?>
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index e2a1aa1c8eb9f4159494759fdf6541a99cbc76aa..3ef7345bacc53879895b105b5e4f6642b825b919 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "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"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "تحذير"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "خطأ"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "تحذير"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "خطأ"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "خطأ"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
-#, php-format
-msgid "Class(es) available"
-msgstr ""
-
-#: include/functions.inc:2636
-msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
+#: include/functions.inc:2085
 #, php-format
-msgid "%sPoolMin >= %sPoolMax!"
+msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+#: include/functions.inc:2103
+msgid ""
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1972,12 @@ msgstr "الإسم"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "الوصف"
@@ -2119,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2031,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2041,154 @@ msgstr ""
 msgid "Remove"
 msgstr "إزالة"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2400,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2539,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "تلقائي"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2567,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2588,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "الإسم العائلي"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "الإسم الأول"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "العنوان"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "الهاتف"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "الفاكس"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "رقم المنزل"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "القسم"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "الرقم البريدي"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2984,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3089,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3663,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3873,7 @@ msgid "Information"
 msgstr "معلومات"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3897,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "مجموعة"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index a07482350ecbe696190edad223263c91360d5f55..cd4de44c8d10779bd717c9f1b65661eed4bbca0b 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Llengua preferida"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Avís"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finalitza"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "D'acord"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Avís"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Error"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finalitza"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Error"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error de la configuració"
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Canceŀla-ho tot"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Entrada"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nom de la plantilla"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Error fatal"
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error d'autenticació."
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "El meu compte"
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr "Canceŀla"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplica"
@@ -1666,7 +1528,9 @@ msgstr "Aquest compte no té extensions de %s vàlides!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Aquest compte té paràmetres de %s habilitats. Podeu inhabilitar-los fent clic a sota."
+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
 #, php-format
@@ -1682,239 +1546,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "gener"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "febrer"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "març"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "maig"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "juny"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "juliol"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "agost"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "setembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "octubre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "novembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "desembre"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "diumenge"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "dilluns"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "dimarts"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "dimecres"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "dijous"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "divendres"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "dissabte"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objecte"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1823,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1886,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1974,12 @@ msgstr "Nom"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,11 +1990,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2033,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2043,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2230,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2240,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2291,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2325,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,45 +2402,43 @@ msgstr "Especifiqueu la vostra contrasenya."
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "El vostre navegador té les galetes inhabilitades. Habiliteu les galetes i torneu a carregar aquesta pàgina abans d'entrar."
+msgstr ""
+"El vostre navegador té les galetes inhabilitades. Habiliteu les galetes i "
+"torneu a carregar aquesta pàgina abans d'entrar."
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
+msgstr ""
+"La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2595,7 +2477,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2544,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Directori personal"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Intèrpret d'ordres"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Compte"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2572,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2593,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Cognoms"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nom"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localització"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Província"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adreça"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Núm de sala"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de sala"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telèfon"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Buscapersones"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Pàgina principal"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Adreça postal personal"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telèfon privat"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Número de telèfon personal"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organització"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Núm de department"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número de departament"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Núm d'empleat"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número d'empleat"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Categoria professional"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Responsable"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "La contrasenya nova és massa curta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2989,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3094,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Paràmetres de la contrasenya"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3668,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3797,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3858,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3878,7 @@ msgid "Information"
 msgstr "Informació"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3902,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4100,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4345,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4357,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 670a32857c256d4e132eb443ddb94ebeb43917f9..59ba2915881c5fa42658c412f9bd595009a77151 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -1,943 +1,899 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
-msgstr "Upřednostňovaný jazyk"
+msgstr "upřednostňovaný jazyk"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
-msgstr "Nastavení jazyka"
+msgstr "nastavení jazyka"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "V tomto kroku vyberete Vámi upřednostňovaný jazyk."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
-msgstr "V tomto okamžiku je možné zvolit výchozí jazyk pro celý systém. Volba samočinně použije jazyk požadovaný přistupujícím webovým prohlížečem. Toto nastavení může být přebito."
+msgstr ""
+"V tomto okamžiku je možné zvolit výchozí jazyk pro celý systém. Volba "
+"samočinně použije jazyk požadovaný přistupujícím webovým prohlížečem. Toto "
+"nastavení může být přebito."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
-msgstr "Samočinné"
+msgstr "automaticky"
+
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "název místa"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+"Název tohoto připojení, který bude zobrazován v seznamu serverů v LDAP"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "připojovací URI (adresa)"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+"URI adresa, na které kontaktovat LDAP server. Obvykle začíná na ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "připojení pomocí TLS (šifrované)"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr "Šifrovat komunikaci s LDAP serverem (pomocí TLS)?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "základ"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "Základ LDAP adresáře"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "ověření"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"Rozlišený název účtu správce, použitého pro spojování do LDAP. Základ je "
+"připojen samočinně."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN (rozlišené jméno) účtu správce"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "heslo účtu správce"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr "Heslo k účtu správce, použitého pro spojování do LDAP"
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "stav"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "současný stav"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr "Výsledek posledního pokusu kontroly LDAP spojení a základních schémat"
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "nastavení LDAPu"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "nastavení připojení k LDAPu"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"V tomto dialogu budou provedena základní nastavení pro komunikaci "
+"FusionDirectory s LDAPem."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonymní přihlášení k serveru '%s' se nezdařilo!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Přihlášení jako uživatel '%s' se nezdařilo!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "znovu"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Anonymní přihlášení k serveru '%s' proběhlo úspěšně."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "obnovit"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Zadejte prosím uživatelské jména a heslo!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Přihlášení se jako uživatel '%s' k serveru '%s' proběhlo úspěšně!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "varování"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "chyba instalátoru"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "hotovo"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "následující"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "vítejte"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "dokončit"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "dokončení – zapsání nastavení do souboru"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "zapsání nastavení do souboru"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Váš soubor s konfigurací je v tuto chvíli čitelný úplně pro všechny. Upravte"
+" nastavení oprávnění pro přístup k němu."
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Soubor s nastaveními není v tuto chvíli čitelný, nebo zcela chybí."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Po stažení a umístění souboru do %s se prosím ujistěte, že %s je oprávněn "
+"číst pouze uživatelský účet, pod kterým běží webový server a nikdo jiný."
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
-msgstr "Kontroly PHP a rozšiřujících komponent"
+msgstr "kontroly PHP a jeho rozšiřujících modulů"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr "Nastavení PHP (<a href=\"?info\" target=\"_blank\">zobrazit informace)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
-msgstr "Kontrola instalace"
+msgstr "kontrola instalace"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr "Základní kontrola toho, zda je PHP a rozšířující moduly ve vyhovujících verzích"
+msgstr ""
+"základní kontrola toho, zda je PHP a jeho rozšířující moduly ve vyhovujících"
+" verzích"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
-msgstr "Kontrola verze PHP…"
+msgstr "kontroluji verzi PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
-msgstr "Je třeba, aby PHP bylo ve verzi %s a vyšší."
+msgstr "PHP musí být ve verzi %s a vyšší"
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
-msgstr "Přejděte na verzi, která je podporována."
+msgstr "Aktualizujte prosím na verzi, která je podporována."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr "FusionDirectory potřebuje tento modul pro komunikaci s LDAP serverem."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory potřebuje tento modul pro přizpůsobení uživatelského rozhraní místním odlišnostem (formát data a času, měrné jednotky, atp.)."
+msgstr ""
+"FusionDirectory potřebuje tento modul pro přizpůsobení uživatelského "
+"rozhraní místním odlišnostem (formát data a času, měrné jednotky, atp.)."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory potřebuje tento modul pro komunikaci různými protokoly s různými typy serverů."
+msgstr ""
+"FusionDirectory potřebuje tento modul pro komunikaci různými protokoly s "
+"různými typy serverů."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory potřebuje tento modul pro začlenění Samby."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "Aby bylo možné ve FusionDirectory využívat SSHA šifrování, musí být nainstalován jeden z těchto modulů: 'mhash', nebo 'sha1'."
+msgstr ""
+"Aby bylo možné ve FusionDirectory využívat SSHA šifrování, musí být "
+"nainstalován jeden z těchto modulů: 'mhash', nebo 'sha1'."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr "FusionDirectory potřebuje tento modul pro komunikaci s IMAP serverem."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
-msgstr "vícebajtový řetězec (mbstring)"
+msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr "FusionDirectory potřebuje tento modul pro práci se znaky v univerzálním kódování (unicode)."
+msgstr ""
+"FusionDirectory potřebuje tento modul pro práci se znaky v univerzálním "
+"kódování (unicode)."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "ImageMagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory jej potřebuje pro práci s obrázky."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "kompresní modul"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory toto rozšíření potřebuje pro práci se snímky."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "„register_globals“ je mechanizmus v PHP pro registraci všech globálních proměnných, které jsou tak dostupné ze skriptů aniž by bylo třeba měnit jejich rozsah. Jenže to může rizikové z hlediska zabezpečení."
+msgstr ""
+"„register_globals“ je mechanizmus v PHP pro registraci všech globálních "
+"proměnných, které jsou tak dostupné ze skriptů aniž by bylo třeba měnit "
+"jejich rozsah. Jenže to může rizikové z hlediska zabezpečení."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Vyhledejte ve svém souboru php.ini parametr register_globals a nastavte jej na hodnotu off . "
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'register_globals' a nastavte jej na "
+"'off'. "
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP tuto hodnotu používá pro „úklid“ (garbage collector) při odstraňování starých relací."
+msgstr ""
+"PHP tuto hodnotu používá pro „úklid“ (garbage collector) při odstraňování "
+"starých relací."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Nastavení této hodnoty na jeden den zabrání ztrátě relace a cookies dříve, než skutečně vyprší nastavený časový limit."
+msgstr ""
+"Nastavení této hodnoty na jeden den zabrání ztrátě relace a cookies dříve, "
+"než skutečně vyprší nastavený časový limit."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Vyhledejte ve svém php.ini parametr 'session.gc_maxlifetime' a nastavte jej na hodnotu '86400' a vyšší."
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'session.gc_maxlifetime' a nastavte jej "
+"na hodnotu '86400' a vyšší."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
-msgstr "Vypnuto"
+msgstr "vypnuto"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Abyste se vyhnuli potížím při používání FusionDirectory, vyhledejte ve svém php.ini parametr session.auto_start a nastavte jej na hodnotu off ."
+msgstr ""
+"Abyste se vyhnuli potížím při používání FusionDirectory, vyhledejte ve svém "
+"php.ini parametr session.auto_start a nastavte jej na hodnotu off ."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Vyhledejte ve svém souboru php.ini parametr session.auto_start a nastavte jej na hodnotu off ."
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'session.auto_start' a nastavte jej na "
+"'off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "Pro svůj běh FusionDirectory potřebuje, aby mu bylo vyhrazeno alespoň 128MB  operační paměti. Provozování pod touto hranicí může způsobovat nevyzpytatelné chyby! Pro rozsáhlá nasazení je třeba tuto hodnotu ještě dále navýšit."
+msgstr ""
+"Pro svůj běh FusionDirectory potřebuje, aby mu bylo vyhrazeno alespoň 128MB"
+"  operační paměti. Provozování pod touto hranicí může způsobovat "
+"nevyzpytatelné chyby! Pro rozsáhlá nasazení je třeba tuto hodnotu ještě dále"
+" navýšit."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "V souboru s nastaveními php.ini na svém serveru vyhledejte volbu memory_limit a nastavte ji na hodnotu 128M a vyšší."
+msgstr ""
+"V souboru s nastaveními php.ini na svém serveru vyhledejte volbu "
+"memory_limit a nastavte ji na hodnotu 128M a vyšší."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Tato volba ovlivňuje to, jak PHP zachází s výstupem. Pro zvýšení výkonu nastavte na hodnotu off ."
+msgstr ""
+"Tato volba ovlivňuje to, jak PHP zachází s výstupem. Pro zvýšení výkonu "
+"nastavte na 'vypnuto'."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr "Vyhledejte ve svém souboru php.ini parametr implicit_flush a nastavte jej na hodnotu off."
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'implicit_flush' a nastavte jej na "
+"'off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "PHP skripty by měly dostat čas alespoň 30 vteřin na to, aby proběhly."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Vyhledejte ve svém php.ini parametr 'max_execution_time' a nastavte jej na hodnotu '30' a vyšší."
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'max_execution_time' a nastavte jej na "
+"hodnotu '30' a vyšší."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Pro zlepšení zabezpečení nastavte PHP tak, aby neposkytovalo jakékoli informace o serveru, na kterém běží."
+msgstr ""
+"Pro zlepšení zabezpečení nastavte PHP tak, aby neposkytovalo jakékoli "
+"informace o serveru, na kterém běží."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr "Vyhledejte ve svém php.ini parametr 'expose_php' a nastavte jej na 'off'."
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'expose_php' a nastavte jej na 'off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Výkonnost serveru můžete zlepšit nastavením parametru magic_quotes_gpc na hodnotu off ."
+msgstr ""
+"Výkonnost Vašeho serveru můžete zlepšit nastavením parametru "
+"'magic_quotes_gpc' na 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Vyhledejte ve svém souboru php.ini parametr zend.ze1_compatibility_mode a nastavte jej na hodnotu off ."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Vítejte"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Vítejte v průvodci nastavením FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Uvítací zpráva"
+msgstr ""
+"Vyhledejte ve svém php.ini parametr 'zend.ze1_compatibility_mode' a nastavte"
+" jej na 'off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
-msgstr "OK"
+msgstr "v pořádku"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
-msgstr "Přemístit"
+msgstr "migrovat"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
-msgstr "Prohlídka LDAP"
+msgstr "kontrola LDAPu"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
-msgstr "Zjistit, zda je vaše stávající LDAP databáze slučitelná s FusionDirectory"
+msgstr "prozkoumání Vášeho LDAPu, zda je slučitelný s FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Udělit veškerá práva na uživatelích v dané větvi"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
-msgstr "Umožnit uživatelům upravovat své vlastní údaje (panely Hlavní a Posix použijte jen na základu)"
+msgstr ""
+"Umožnit uživatelům upravovat své vlastní údaje (panely Hlavní a Posix "
+"použijte jen na základu)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
-msgstr "Umožnit uživatelům upravovat jejich vlastní hesla (použijte pouze na základu)"
+msgstr ""
+"Umožnit uživatelům upravovat jejich vlastní hesla (použijte pouze na "
+"základu)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "kontrolují se třídy objektů v kořenovém objektu"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "kontrolují se oprávnění na LDAP databázi"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "kontroluje se, zda neexistují „neviditelní“ uživatelé"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "kontroluji, zda již existuje účet správce FusionDirectory/GOsa"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Kontrola výchozích ACL úloh a skupin"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "kontroluje se, zda neexistují účty uživatelů mimo příslušný podstrom"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
-msgstr "Kontroluje se, zda neexistují účty skupin mimo příslušný podstrom"
+msgstr "kontroluje se, zda neexistují účty skupin mimo příslušný podstrom"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "kontroluje se, zda neexistují „neviditelná“ oddělení"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
-msgstr "kontroluje se, zda neexistují duplicity v číselných identifikátorech uživatelů (UID)"
+msgstr ""
+"kontroluje se, zda neexistují duplicity v číselných identifikátorech "
+"uživatelů (UID)"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
-msgstr "Dotaz do LDAP nebyl úspěšný"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+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
 msgid "Possibly the \"root object\" is missing."
 msgstr "Možná chybí kořenový objekt."
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
-msgstr "Nezdařilo se"
+msgstr "selhalo"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
-msgstr "Chybí třída objektů FusionDirectory %s!"
+msgstr "Chybí chybí třída objektů '%s' FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
-msgstr "Zkontrolujte svou instalaci."
+msgstr "Zkontrolujte prosím Vaši instalaci."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "Nedaří se manipulace s typem struktury kořenového objektu. Prosím pokuste se přidat třídu objektů '%s' ručním zásahem."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"Nedaří se manipulace s typem struktury kořenového objektu. Prosím pokuste se"
+" přidat třídu objektů '%s' ručním zásahem."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
-msgstr "Chyba LDAP"
+msgstr "chyba LDAPu"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr "Zvolený uživatel %s nemá plný přístup do LDAP databáze."
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr "Zvolený uživatel %s nemá plný přístup do LDAP databáze."
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Varování"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Nalezeno %s uživatelů, kteří nebudou dostupní z FusionDirectory nebo jsou jejich účty neúplné."
+msgstr ""
+"Nalezeno %s uživatelů, kteří nebudou dostupní z FusionDirectory nebo jsou "
+"jejich účty neúplné."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Přemístění uživatele"
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
-msgstr "Chyba přemisťování"
+msgstr "chyba během migrace"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Položku %s nelze přemístit:"
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Nalezeny správcovské účty z F.D. 1.0.7: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "uživatelé"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Nalezeny správcovské skupiny z F.D. 1.0.7: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "skupiny"
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr "Na konci nastavení je možné spustit <i>fusiondirectory-setup --migrate-acls</i> a přemístit ho.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "role"
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr "Ve vaší LDAP databázi se nenachází žádný použitelný účet správce FusionDirectory 1.0.8."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgstr "Ve Vašem LDAPu neexistuje účet správce FusionDirectory/GOsa."
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
-msgstr "Vytvořit"
-
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Uživatelé"
+msgstr "vytvořit"
 
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr "Skupiny"
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr "Ve vaší LDAP databázi se nenachází žádný účet správce FusionDirectory."
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Uděluje veškerá práva na veškerých objektech"
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Chyba"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "Výchozí ACL úlohy nebyly vloženy"
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Chybí některé výchozí ACL úlohy"
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Výchozí ACL úlohy byly vloženy"
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Nelze přidat ACL úlohu %s:"
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, 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_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
-msgstr "Přesunout uživatele do příslušného stromu"
+msgstr "přesunout uživatele do příslušného stromu"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr "Položky nelze přesunout do požadovaného oddělení!"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "Položka bude přesunuta z"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
-msgstr "Tyto odkazy budou aktualizovány"
+msgstr "tyto odkazy budou aktualizovány"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, 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'."
+msgstr ""
+"Bylo nalezeno %s účtů skupin, nacházejících se mimo příslušný strom '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Přesunout skupiny do příslušného stromu"
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr "Přemístění oddělení"
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Název umístění"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr "Název tohoto připojení, který bude zobrazován v seznamu serverů v LDAP"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "připojovací URI (adresa)"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI adresa, na které kontaktovat LDAP server. Obvykle začíná na ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS (šifrované) spojení"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "Šifrovat komunikaci s LDAP serverem (pomocí TLS)?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Základ"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "Základ LDAP adresáře"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Ověření"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr "Rozlišený název účtu správce, použitého pro spojování do LDAP. Základ je připojen samočinně."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Rozlišený název účtu správce"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Heslo správce"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr "Heslo k účtu správce, použitého pro spojování do LDAP"
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Stav"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Stávající stav"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr "Výsledek posledního pokusu kontroly LDAP spojení a základních schémat"
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Nastavení LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Nastavení připojení k LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "V tomto dialogu budou provedena základní nastavení pro komunikaci FusionDirectory s LDAPem."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonymní spojení se serverem %s se nezdařilo!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Spojení jako uživatel %s se nezdařilo!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Znovu"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Anonymní spojení se serverem %s proběhlo úspěšně."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Znovunačíst"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Zadejte uživatelské jména a heslo!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Přihlášení se jako uživatel '%s' k serveru '%s' proběhlo úspěšně!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Dokončit"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Dokončit – zapsat nastavení do souboru"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Zapsat nastavení do souboru"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Váš soubor s nastaveními je v tuto chvíli čitelný úplně pro všechny. Upravte nastavení oprávnění pro přístup k němu!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Soubor s nastaveními není v tuto chvíli čitelný, nebo zcela chybí."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Po stažení a umístění souboru do %s se ujistěte, že %s je oprávněn číst pouze uživatelský účet, pod kterým běží webový server a nikdo jiný."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Chyba instalátoru"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Hotovo"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "vítejte v průvodci nastavením FusionDirectory"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Další"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "uvítací zpráva"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
-msgstr "Vnitřní chyba"
+msgstr "vnitřní chyba"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
-msgstr "Přihlášení se nezdařilo: %s"
+msgstr "přihlášení selhalo: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
-msgstr "Jako objectType (typ objektu) buď nebylo zadáno nic, nebo nesprávná hodnota."
-
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "nenastavené"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Chyba filtru"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Filtr je neúplný!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Oprávnění"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Chyba oprávnění"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Nejste oprávněni obnovit zachycený stav %s."
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "Deklarace panelu pro %s není uvedena v souboru s nastaveními. Nelze proto vytvořit instanci zásuvného modulu!"
+msgstr ""
+"Jako objectType (typ objektu) buď nebylo zadáno nic, nebo nesprávná hodnota."
 
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
-msgstr "Kořen"
+msgstr "kořen"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
-msgstr "Odeslat"
+msgstr "odeslat"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
-msgstr "Nahoru"
+msgstr "nahoru"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
-msgstr "Dolů"
+msgstr "dolů"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr "Seřadit vzestupně"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr "Seřadit sestupně"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
-msgstr "Vybrat vše"
+msgstr "vybrat vše"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "chyba"
+
+#: include/class_listing.inc:569
 msgid "created by"
-msgstr "vytvořili"
+msgstr "vytvořeno (kým)"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "přejít do kořene všech oddělení"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
-msgstr "Přejít o oddělení výše"
+msgstr "přejít o jedno oddělení výše"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr "Přejít do oddělení uživatele"
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "domovské"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
-msgstr "Znovunačíst seznam"
+msgstr "znovunačtení seznamu"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
-msgstr "Akce"
+msgstr "akce"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "zkopírovat"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
-msgstr "Vyjmout"
+msgstr "vyjmout"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
-msgstr "Vložit"
+msgstr "vložit"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
-msgstr "Vyjmout tuto položku"
+msgstr "vyjmout tuto položku"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
-msgstr "Zkopírovat tuto položku"
+msgstr "kopírovat tuto položku"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
-msgstr "Obnovit zachycené stavy"
+msgstr "obnovit ze snímků"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
-msgstr "Exportovat seznam"
+msgstr "exportovat seznam"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
-msgstr "Obnovit zachycený stav"
+msgstr "obnovit ze snímku"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
-msgstr "Pořídit zachycený stav"
+msgstr "vytvořit snímek"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "vytvořit nový snímek tohoto objektu"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Fatální chyba"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "v"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "připojeno"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Chyba v XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -947,25 +903,28 @@ msgstr "Heslo nelze změnit, neznámý uživatel %s"
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
-msgstr "Aby bylo možné používat SASL, je třeba vyplnit kolonky saslRealm nebo saslExop na obrazovce s nastaveními"
-
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+msgstr ""
+"Aby bylo možné používat SASL, je třeba vyplnit kolonky saslRealm nebo "
+"saslExop na obrazovce s nastaveními"
+
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
-msgstr "Chyba v nastavení"
+msgstr "chyba v nastavení"
 
 #: 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."
-msgstr "Není možné exportovat do formátu PDF: není nainstalována potřebná softwarová knihovna."
+msgstr ""
+"Není možné exportovat do formátu PDF: není nainstalována potřebná knihovna."
 
 #: include/exporter/class_pdfExporter.inc:196
 msgid "PDF"
@@ -978,365 +937,368 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 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ů."
+msgstr ""
+"Požadovaný kanál neexistuje! Prosím kontaktujte svého správce systémů."
+
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "oprávnění"
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
-msgstr "Zrušit vše"
+msgstr "zrušit vše"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
-msgstr "Nelze vložit"
+msgstr "nemohu vložit"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
-msgstr "Přihlašovací jméno"
+msgstr "uživatelské jméno"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
-msgstr "Å ablona"
+msgstr "Å¡ablona"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
-msgstr "Název šablony"
+msgstr "název šablony"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "fatální chyba: není určeno umístění třídy – pro nápravu prosím spusťe '%s'"
+msgstr ""
+"fatální chyba: není určeno umístění třídy – pro nápravu prosím spusťe '%s'"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "fatální chyba: nelze vytvořit instanci třídy '%s' – pokuste se to napravit spuštěním '%s' --update-cache (na serveru) a restartujte svůj webový prohlížeč"
+msgstr ""
+"fatální chyba: nelze vytvořit instanci třídy '%s' – pokuste se to napravit "
+"spuštěním '%s' --update-cache (na serveru) a restartujte svůj webový "
+"prohlížeč"
+
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "fatální chyba"
 
-#: include/functions.inc:493
+#: include/functions.inc:475
 #, 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:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
-msgstr "Přihlašovací údaj (uid) není v rámci LDAP stromu jedinečný! Kontaktujte svého správce systémů."
+msgstr ""
+"Přihlašovací údaj (uid) není v rámci LDAP stromu jedinečný! Kontaktujte "
+"svého správce systémů."
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
-msgstr "Chyba ověření"
+msgstr "chyba ověření"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
-msgstr "Zdá se, že platnost vašeho hesla skončila. Změňte jej pomocí funkce <a href=\"recovery.php\">obnovení hesla</a>."
+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:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 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!"
+msgstr ""
+"Nastala chyba při pokusu o přidání zámku. Nahlaste to prosím vývojářům!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Nedaří se vytvořit informaci o zamykání ve stromu LDAP. Kontaktujte svého správce systémů!"
+msgstr ""
+"Nemohu vytvořit informaci o zamykání ve stromu LDAPu. Kontaktujte prosím "
+"svého správce systémů!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server odpověděl: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-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í."
+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:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit velikosti položek %d je překročen!"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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"
+msgstr ""
+"nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, "
+"zobrazit toto hlášení znovu"
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
-msgstr "Nastavit"
+msgstr "nastavit"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "neúplné"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
-msgstr "Přesto pokračovat"
+msgstr "přesto pokračovat"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
-msgstr "Přesto upravit"
+msgstr "přesto upravit"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Položek na stránku"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Použít filtr"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Soubor %s nebylo možné smazat. Zkuste opravit přístupová práva spuštěním příkazu fusiondirectory-setup --check-directories"
+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:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Nelze zapsat do souboru s revizemi!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Nelze číst ze souboru s revizemi!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "nextIdHook není k dispozici. Bude použit výchozí základ!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
+msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
-msgstr "Varování LDAP"
+msgstr "varování LDAPu"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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!"
+msgstr ""
+"Nedaří se získat informace o schématech ze serveru. Schémata proto nelze "
+"ověřit!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
-msgstr "Dostupné třídy"
+msgstr "dostupné třídy"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
-msgstr "Zásuvný modul smíšených skupin je nainstalován, ale vaše nastavení schématu ho nepodporuje."
+msgstr ""
+"Zásuvný modul smíšených skupin je nainstalován, ale vaše nastavení schématu "
+"ho nepodporuje."
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
-msgstr "Aby bylo možné použít smíšené skupiny v objectClass posixGroup, je třeba aby byly POMOCNÉ"
+msgstr ""
+"Aby bylo možné použít smíšené skupiny v objectClass posixGroup, je třeba aby"
+" byly POMOCNÉ"
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
-msgstr "Stávající schéma je nastaveno pro smíšené skupiny, ale není přítomen příslušný zásuvný modul."
+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:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "Je třeba, aby ObjectClass posixGroup bylo STRUKTURÁLNÍ"
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Není k dispozici volné ID:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "Neznámá metoda idAllocation (přiřazování ID)!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "Identifikátor sambaUnixIdPool není jedinečný!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "Není k dispozici ID!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "Překročen nejvyšší přijatelný počet neúspěšných pokusů!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Není k dispozici volné ID – není co přidělit!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Nelze nalézt soubor %s – opravte to spuštěním %s (na serveru)"
+msgstr ""
+"Nemohu nalézt soubor '%s' – opravte to prosím spuštěním '%s' (na serveru)."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
-msgstr "Všechny objekty v této kategorii"
+msgstr "všechny objekty v této kategorii"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
-msgstr "Opravte výše uvedenou chybu a znovunačtěte tuto stránku."
+msgstr "Opravte prosím výše zmíněnou chybu a znovunačtěte stránku."
 
 #: include/class_timezone.inc:52
 #, php-format
 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_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
-msgstr "Chyba XML ve fusiondirectory.conf: %s na řádku %d"
+msgstr "Chybné XML ve fusiondirectory.conf: %s na řádku %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "Pořizování zachycených stavů je sice zapnuté, ale není nastavena potřebná proměnná %s."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "Pořizování snímků je sice povolené, ale chybí modul pro jejich kompresi. Nainstalujte prosím '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
-msgstr "VÅ¡echny kategorie"
+msgstr "všechny kategorie"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
-msgstr "Můj účet"
+msgstr "můj účet"
 
 #: include/class_msgPool.inc:43
 #, php-format
 msgid "Select to list objects of type '%s'."
-msgstr "Vyberte pro vypsání objektů typu %s."
+msgstr "Vyberte pro vypsání objektů typu '%s'."
 
 #: include/class_msgPool.inc:45
 #, php-format
@@ -1350,11 +1312,11 @@ msgstr "Vyberte pro vypsání objektů, které mají zapnuto '%s'."
 
 #: include/class_msgPool.inc:49
 msgid "Select to search within subtrees"
-msgstr "Zvolte pro vyhledávání i v podstromech"
+msgstr "zvolte pro vyhledávání i v podstromech"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
-msgstr "Hledat v podstromech"
+msgstr "hledat v podstromech"
 
 #: include/class_msgPool.inc:67
 msgid "This object will be deleted!"
@@ -1363,7 +1325,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
@@ -1373,7 +1335,7 @@ msgstr "Tento objekt bude smazán: %s"
 #: include/class_msgPool.inc:76
 #, php-format
 msgid "This '%s' object will be deleted: %s"
-msgstr "Tento %s objekt bude smazán: %s"
+msgstr "Tento '%s' objekt bude smazán: %s"
 
 #: include/class_msgPool.inc:81
 msgid "This object will be deleted:"
@@ -1382,7 +1344,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
@@ -1392,35 +1354,35 @@ 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 "Tyto '%s' objekty budou smazány: %s"
 
 #: include/class_msgPool.inc:101
 msgid "You have no permission to delete this object!"
-msgstr "Nejste oprávněni ke smazání tohoto objektu!"
+msgstr "Nejste oprávněn(a) ke smazání tohoto objektu!"
 
 #: include/class_msgPool.inc:105 include/class_msgPool.inc:109
 msgid "You have no permission to delete the object:"
-msgstr "Nejste oprávněni ke smazání objektu:"
+msgstr "Nejste oprávněn(a) ke smazání objektu:"
 
 #: include/class_msgPool.inc:112
 msgid "You have no permission to delete these objects:"
-msgstr "Nejste oprávněni ke smazání těchto objektů!"
+msgstr "Nejste oprávněn(a) ke smazání těchto objektů!"
 
 #: include/class_msgPool.inc:123
 msgid "You have no permission to create this object!"
-msgstr "Nejste oprávněni k vytvoření tohoto objektu!"
+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ěni k vytvoření objektu:"
+msgstr "Nejste oprávněn(a) k vytvoření objektu:"
 
 #: include/class_msgPool.inc:134
 msgid "You have no permission to create these objects:"
-msgstr "Nejste oprávněni k vytvoření těchto objektů:"
+msgstr "Nejste oprávněn(a) k vytvoření těchto objektů:"
 
 #: include/class_msgPool.inc:146
 msgid "You have no permission to modify this object!"
-msgstr "Nejste oprávněni k úpravám tohoto objektu!"
+msgstr "Nejste oprávněn(a) k úpravám tohoto objektu!"
 
 #: include/class_msgPool.inc:151
 #, php-format
@@ -1439,32 +1401,32 @@ msgstr ""
 
 #: include/class_msgPool.inc:172
 msgid "You have no permission to view this object!"
-msgstr "Nejste oprávněni k zobrazení tohoto objektu!"
+msgstr "Nejste oprávněn(a) k zobrazení tohoto objektu!"
 
 #: include/class_msgPool.inc:176 include/class_msgPool.inc:180
 msgid "You have no permission to view the object:"
-msgstr "Nejste oprávněni k zobrazení objektu:"
+msgstr "Nejste oprávněn(a) k zobrazení objektu:"
 
 #: include/class_msgPool.inc:183
 msgid "You have no permission to view these objects:"
-msgstr "Nejste oprávněni k zobrazení těchto objektů:"
+msgstr "Nejste oprávněn(a) k zobrazení těchto objektů:"
 
 #: include/class_msgPool.inc:194
 msgid "You have no permission to move this object!"
-msgstr "Nejste oprávněni k přesunutí tohoto objektu!"
+msgstr "Nejste oprávněn(a) k přesunutí tohoto objektu!"
 
 #: include/class_msgPool.inc:198 include/class_msgPool.inc:202
 msgid "You have no permission to move the object:"
-msgstr "Nejste oprávněni k přesunutí tohoto objektu:"
+msgstr "Nejste oprávněn(a) k přesunutí tohoto objektu!"
 
 #: include/class_msgPool.inc:205
 msgid "You have no permission to move these objects:"
-msgstr "Nejste oprávněni k přesunutí těchto objektů:"
+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
@@ -1479,7 +1441,7 @@ msgstr "Nelze vybrat databázi %s!"
 #: include/class_msgPool.inc:255
 #, php-format
 msgid "No %s server defined!"
-msgstr "Není určen server %s!"
+msgstr "není určen server %s!"
 
 #: include/class_msgPool.inc:275
 #, php-format
@@ -1489,7 +1451,8 @@ msgstr "Nedaří se dotazovat do databáze %s!"
 #: include/class_msgPool.inc:285
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
-msgstr "Pole %s obsahuje vyhrazené klíčové slovo (použijte něco jiného)!"
+msgstr ""
+"Pole '%s' obsahuje vyhrazené klíčové slovo (použijte prosím něco jiného)!"
 
 #: include/class_msgPool.inc:297
 #, php-format
@@ -1499,27 +1462,27 @@ 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
 msgid "'%s' command for plugin %s is invalid!"
-msgstr "%s příkaz pro zásuvný modul %s není platný!"
+msgstr "'%s' příkaz pro zásuvný modul %s není správný!"
 
 #: include/class_msgPool.inc:319
 #, php-format
 msgid "'%s' command (%s) is invalid!"
-msgstr "%s příkaz (%s) není platný!"
+msgstr "'%s' příkaz (%s) není správný!"
 
 #: include/class_msgPool.inc:321
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "%s příkaz (%s) pro zásuvný modul %s není platný!"
+msgstr "'%s' příkaz (%s) pro zásuvný modul %s není správný!"
 
 #: include/class_msgPool.inc:339
 #, php-format
 msgid "Cannot execute '%s' command!"
-msgstr "Nedaří se spustit příkaz %s!"
+msgstr "Nedaří se spustit příkaz '%s'!"
 
 #: include/class_msgPool.inc:341
 #, php-format
@@ -1539,32 +1502,32 @@ msgstr "Nedaří se spustit příkaz '%s' (%s) pro zásuvný modul %s!"
 #: include/class_msgPool.inc:362
 #, php-format
 msgid "Value for '%s' is too large!"
-msgstr "Hodnota %s je příliš vysoká!"
+msgstr "Hodnota '%s' je příliš vysoká!"
 
 #: include/class_msgPool.inc:364
 #, php-format
 msgid "'%s' must be smaller than %s!"
-msgstr "Je třeba, aby %s bylo menší než %s!"
+msgstr "'%s' musí být 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 "Je třeba, aby %s bylo větší nebo rovno %d!"
+msgstr "'%s' musí být %d a větší!"
 
 #: include/class_msgPool.inc:393
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
-msgstr "%s závisí na %s – zadejte obě hodnoty!"
+msgstr "'%s' závisí na '%s' – zadejte prosím obě hodnoty!"
 
 #: include/class_msgPool.inc:404
 #, 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!"
+msgstr "V systému již existuje položka s atributem '%s'!"
 
 #: include/class_msgPool.inc:406
 #, php-format
@@ -1574,7 +1537,7 @@ msgstr "Položka %s již používá tento %s atribut!"
 #: include/class_msgPool.inc:417
 #, php-format
 msgid "The required field '%s' is empty!"
-msgstr "Pole %s nemůže být prázdné!"
+msgstr "Pole '%s' nemůže být prázdné!"
 
 #: include/class_msgPool.inc:435
 msgid "Example:"
@@ -1588,12 +1551,12 @@ msgstr "Políčko %s obsahuje neplatné znaky"
 #: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
-msgstr "%s není dovoleno:"
+msgstr "'%s' není dovoleno:"
 
 #: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
-msgstr "%s nejsou dovolené!"
+msgstr "'%s' nejsou dovolené!"
 
 #: include/class_msgPool.inc:470
 #, php-format
@@ -1601,33 +1564,32 @@ 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
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
 msgid "Cancel"
-msgstr "Zrušit"
+msgstr "zrušit"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
-msgstr "Použít"
+msgstr "použít"
 
 #: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
-msgstr "Uložit"
+msgstr "uložit"
 
 #: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
-msgstr "Přidat"
+msgstr "přidat"
 
 #: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
-msgstr "Přidat %s"
+msgstr "přidat %s"
 
 #: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
@@ -1635,26 +1597,26 @@ msgstr "Přidat %s"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
-msgstr "Smazat"
+msgstr "smazat"
 
 #: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
-msgstr "Smazat %s"
+msgstr "smazat %s"
 
 #: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
-msgstr "Upravit…"
+msgstr "upravit…"
 
 #: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
-msgstr "Upravit %s…"
+msgstr "upravit %s…"
 
 #: include/class_msgPool.inc:540
 msgid "Back"
-msgstr "Zpět"
+msgstr "zpět"
 
 #: include/class_msgPool.inc:569
 #, php-format
@@ -1666,258 +1628,274 @@ msgstr "Tento účet nemá platná rozšíření %s!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Tento účet má zapnuta nastavení %s. Vypnout je můžete kliknutím níže."
+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
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Tento účet má vytvořena nastavení pro %s. Pokud je chcete odebrat, musíte ale nejprve odebrat nastavení pro %s!"
+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
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Tento účet má deaktivována nastavení pro %s. Zapnout je můžete kliknutím níže."
+msgstr ""
+"Tento účet má deaktivována nastavení pro %s. Zapnout je můžete kliknutím "
+"níže."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Tento účet má deaktivována nastavení pro %s. Zapnout je ale můžete teprve poté, co přidáte nastavení pro %s!"
+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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
-msgstr "Přidat nastavení pro %s"
+msgstr "přidat nastavení pro %s"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
-msgstr "Odebrat nastavení pro %s"
+msgstr "odebrat nastavení pro %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "leden"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "únor"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "březen"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "duben"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "květen"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "červen"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "červenec"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "srpen"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "září"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "říjen"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "listopad"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "prosinec"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "neděle"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "pondělí"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "úterý"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "středa"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "čtvrtek"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "pátek"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
-msgstr "Sobota"
-
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Operace v databázi se nezdařila!"
+msgstr "sobota"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
-msgstr "Operace čtení"
+msgstr "operace čtení"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
-msgstr "Operace přidání"
+msgstr "operace přidání"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
-msgstr "Operace upravování"
+msgstr "operace upravování"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
-msgstr "Operace mazání"
+msgstr "operace smazání"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
-msgstr "Operace hledání"
+msgstr "operace hledání"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
-msgstr "Ověření"
+msgstr "ověření"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
-msgstr "LDAP %s se nezdařilo!"
+msgstr "LDAP %s selhalo!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
-msgstr "Operace v LDAP databázi se nezdařila!"
+msgstr "Operace v LDAPu selhala!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
-msgstr "Objekt"
+msgstr "objekt"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
-msgstr "Nahrání se nezdařilo!"
+msgstr "Nahrání selhalo!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
-msgstr "Nahrání se nezdařilo: %s"
+msgstr "Nahrání selhalo: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
-msgstr "Výpadek komunikace se službou infrastruktury!"
+msgstr "Selhání komunikace se službou infrastruktury!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Selhání komunikace se službou infrastruktury: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
-msgstr "Toto %s je stále používáno objektem: %s"
+msgstr "toto '%s' je stále používáno objektem: %s"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
-msgstr "Toto %s je stále používáno."
+msgstr "Toto '%s' je stále používáno."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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"
+msgstr "toto '%s' je stále používáno následujícími objekty: %s"
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
-msgstr "Soubor %s neexistuje!"
+msgstr "Soubor '%s' neexistuje!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
-msgstr "Soubor %s nelze číst!"
+msgstr "Soubor '%s' nelze číst!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
-msgstr "Do souboru %s nelze zapisovat!"
+msgstr "Do souboru '%s' nelze zapisovat!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "Hodnota %s v tuto chvíli buď není nastavena, nebo je neplatná – překontrolujte svůj soubor s nastaveními!"
+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:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
-msgstr "Soubor %s nelze smazat!"
+msgstr "Soubor '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
-msgstr "Složku %s se nedaří vytvořit!"
+msgstr "Složku '%s' nelze vytvořit!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
-msgstr "Složku %s nelze smazat!"
+msgstr "Složku '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
-msgstr "Ověřování, zda je podporováno %s"
+msgstr "kontroluji, zda je podporováno: %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
-msgstr "Nainstalovat a zapnout modul PHP %s."
+msgstr "Nainstalovat a aktivovat modul PHP %s."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Nainstalovat a zapnout Pear modul %s"
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Nelze připravit třídu '%s'! Možná ve Vaší instalaci FusionDirectory chybí příslušný zásuvný modul?"
+msgstr ""
+"Nelze připravit třídu '%s'! Možná ve Vaší instalaci FusionDirectory chybí "
+"příslušný zásuvný modul?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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í!"
+msgstr ""
+"Nově zadaná hodnota základu není platná a proto je stále používána "
+"předchozí!"
 
 #: include/class_SnapshotDialogs.inc:30
 msgid "Creating an object snapshot"
@@ -1929,7 +1907,7 @@ msgstr "DN objektu, ze kterého pořizujete zachycený stav"
 
 #: include/class_SnapshotDialogs.inc:37
 msgid "Timestamp"
-msgstr "Časová značka"
+msgstr "časová značka"
 
 #: include/class_SnapshotDialogs.inc:37
 msgid "Timestamp of this snapshot creation"
@@ -1945,7 +1923,7 @@ msgstr "Důvod pořízení tohoto zachyceného stavu"
 
 #: include/class_SnapshotDialogs.inc:60 include/class_SnapshotDialogs.inc:118
 msgid "Y-m-d, H:i:s"
-msgstr "R-m-d, H:m:s"
+msgstr "r-m-d, h:m:v"
 
 #: include/class_SnapshotDialogs.inc:135 include/class_SnapshotDialogs.inc:136
 msgid "Restore"
@@ -1956,7 +1934,6 @@ msgid "Restoring snapshots"
 msgstr "Obnovení zachycených stavů"
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Zachycené stavy"
 
@@ -1966,11 +1943,11 @@ msgstr "Zachycené stavy, které jsou pro tento objekt k dispozici"
 
 #: 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"
-msgstr "Řádek"
+msgstr "linka"
 
 #: include/php_setup.inc:53
 msgid "PHP error"
@@ -1998,11 +1975,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!"
@@ -2014,104 +1991,111 @@ msgstr "zaslat hlášení o chybě vývojářům FusionDirectory"
 
 #: include/php_setup.inc:237
 msgid "Send bugreport"
-msgstr "Zaslat hlášení o chybě"
+msgstr "zaslat hlášení o chybě"
 
 #: include/php_setup.inc:242
 msgid "Toggle information"
 msgstr "přepnout informace"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
-msgstr "Varování ohledně výkonu"
+msgstr "varování ohledně výkonu"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
-msgstr "Podstromy s RDN %s se nedaří automaticky vytvářet: nebyla nalezena žádná třída objektu!"
+msgstr ""
+"Podstromy s RDN %s se nedaří automaticky vytvářet: nebyla nalezena žádná "
+"třída objektu!"
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, 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:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
-msgstr "při operaci na %s na LDAP serveru %s"
+msgstr "při operaci na '%s' na LDAP serveru '%s'"
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
-msgstr "při operaci na LDAP serveru %s"
+msgstr "při operaci na LDAP serveru '%s'"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open se nezdařilo vykonat ldapsearch"
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Vyberte požadované položky"
+msgstr "vyberte prosím požadované položky"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: 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
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: include/simpleplugin/class_dialogAttributes.inc:426
 #, php-format
@@ -2119,18 +2103,20 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Role %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Skupina %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:465
 msgid "Group of user"
-msgstr "Skupina uživatele"
+msgstr "skupina uživatelů"
 
 #: include/simpleplugin/class_dialogAttributes.inc:634
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
@@ -2154,146 +2140,173 @@ msgstr "neznámé"
 #: plugins/admin/groups/group-list.xml:119
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 msgid "Edit"
-msgstr "Upravit"
+msgstr "upravit"
 
 #: include/simpleplugin/class_dialogAttributes.inc:655
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
 #: plugins/admin/groups/group-list.xml:82
 #: plugins/admin/groups/group-list.xml:132
 msgid "Remove"
-msgstr "Odstranit"
+msgstr "odebrat"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "Nebylo nalezeno žádné určení zásuvného modulu pro inicializaci %s – zkontrolujte svůj soubor s nastaveními."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Průběh mazání byl přerušen zásuvným modulem %s: %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
-msgstr "sekundy"
+msgstr "vteřiny"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minuty"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "hodiny"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "dny"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Ze Å¡ablony"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "%s Å¡ablona"
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Zobrazit %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "chyba filtru"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Tento filtr je neúplný!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "chyba oprávnění"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "BEZ POPISKU"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr "Nastavení šablony"
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Toto je název šablony"
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr "Pouze hlavní panel může vypočítat rozlišený název"
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, 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"
+msgstr ""
+"Nedaří se spočítat rozlišený název: žádná nadřazená třída panelu pro %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
-msgstr "Nedaří se spočítat dn: nedaří se nalézt objectType informace z panelu třídy %s"
-
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Chyba při ukládání"
+msgstr ""
+"Nedaří se spočítat dn: nedaří se nalézt objectType informace z panelu třídy "
+"%s"
 
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Položka %s neexistuje"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Panel %s"
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,17 +2346,17 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bajtů)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
-msgstr "Nahrát"
+msgstr "nahrát"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:124
 #: include/simpleplugin/attributes/class_FileAttribute.inc:125
 msgid "Download"
 msgstr "stažení"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2407,10 @@ msgstr "Desetinné číslo větší než %f"
 msgid "A float smaller than %f"
 msgstr "Desetinné číslo menší než %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Došlo k problému s rozbalováním dat zachyceného stavu"
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Panel %s"
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "přístupová práva (ACL)"
@@ -2433,26 +2429,33 @@ msgstr "ACL role"
 msgid ""
 "Unkown ACL type '%s'!\n"
 "You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
-msgstr "Neznámý typ ACL %s!\nPro převod acl do nového formátu spusťte fusiondirectory-setup --migrate-acls."
+msgstr ""
+"Neznámý typ ACL %s!\n"
+"Pro převod acl do nového formátu spusťte fusiondirectory-setup --migrate-acls."
 
 #: 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é"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "použít filtr"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Složka %s, nastavená jako místo pro provedení sestavení, není přístupná!"
+msgstr ""
+"Adresář  '%s', nastavený jako místo pro provedení kompilace, není přístupný!"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2470,11 +2473,13 @@ msgstr ""
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "Nastavení FusionDirectory %s/%s není čitelné. Pro nápravu spusťte (na serveru) příkaz fusiondirectory-setup --check-config ."
+msgstr ""
+"Nastavení FusionDirectory %s/%s není čitelné. Pro nápravu spusťte (na "
+"serveru) příkaz fusiondirectory-setup --check-config ."
 
 #: html/index.php:171
 msgid "Smarty error"
-msgstr "Chyba ve Smarty"
+msgstr "chyba ve Smarty"
 
 #: html/index.php:173
 #, php-format
@@ -2483,7 +2488,9 @@ msgstr "Složka %s, zadaná jako kompilační, není přístupná!"
 
 #: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
-msgstr "Platnost vašeho sezení ve FusionDirectory skončila!"
+msgstr ""
+"Vaše relace ve FusionDirectory byla automaticky ukončena po Vaší delší "
+"neaktivitÄ›!"
 
 #: html/index.php:211
 msgid "Your IP has changed!"
@@ -2508,50 +2515,47 @@ msgstr ""
 
 #: html/index.php:282
 msgid "Please specify a valid username!"
-msgstr "Zadejte platné uživatelské jméno!"
+msgstr "Zadejte prosím platné uživatelské jméno!"
 
 #: html/index.php:285
 msgid "Please specify your password!"
-msgstr "Zadejte své heslo!"
+msgstr "Zadejte prosím své heslo!"
 
 #: html/index.php:304
 msgid "Please check the username/password combination."
-msgstr "Zkontrolujte prosím správnost kombinace zadaného uživatelského jména a hesla."
+msgstr "Zkontrolujte prosím správnost zadaného uživatelského jména a hesla."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
-msgstr "Účet je uzamčen. Kontaktujte svého správce systémů!"
+msgstr "Účet je uzamčen. Prosím kontaktujte svého správce systémů."
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Váš webový prohlížeč má zakázané cookies. Prosím povolte je a před dalším pokusem o přihlášení stránku nechejte tuto stránku načíst znovu!"
+msgstr ""
+"Váš webový prohlížeč má zakázané cookies. Prosím povolte je a před dalším "
+"pokusem o přihlášení stránku nechejte tuto stránku načíst znovu!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2560,7 +2564,7 @@ msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
-msgstr "E-mailová adresa"
+msgstr "e-mailová adresa"
 
 #: html/class_passwordRecovery.inc:471
 #, php-format
@@ -2589,33 +2593,39 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Nastal problém s poštovním serverem – obraťte se na svého správce systémů."
+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:586
 msgid "This token is invalid"
 msgstr "tato poukázka (token) je neplatná"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 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 odeslán"
+msgstr ""
+"Vyskytl se problém s poštovním serverem, potvrzovací e-mail proto nebyl "
+"odeslán"
 
 #: html/main.php:115
 msgid "PHP configuration"
-msgstr "Nastavení PHP"
+msgstr "nastavení PHP"
 
 #: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Fatální chyba: v PHP je zapnuto 'register globals'. Dokud to Váš správce systémů neopraví, nebude možné se přihlásit do FusionDirectory."
+msgstr ""
+"Fatální chyba: v PHP je zapnuto 'register globals'. Dokud to Váš správce "
+"systémů neopraví, nebude možné se přihlásit do FusionDirectory."
 
 #: html/main.php:142
 msgid "Password change"
-msgstr "Změna hesla"
+msgstr "změna hesla"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "Platnost vašeho hesla již brzy skončí – změňte ho prosím!"
+msgstr "Platnost Vašeho hesla již brzy skončí – změňte ho prosím!"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2631,25 +2641,29 @@ msgstr "kontrola dle ACL je vypnuta"
 
 #: html/main.php:289
 msgid "Plugin"
-msgstr "Zásuvný modul"
+msgstr "zásuvný modul"
 
 #: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
-msgstr "Fatální chyba: Nelze nalézt jakékoli definice zásuvného modulu pro modul %s (%s není soubor)!"
+msgstr ""
+"Fatální chyba: Nelze nalézt jakékoli definice zásuvného modulu pro modul %s "
+"(%s není soubor)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
-msgstr "Chyba v nastavení"
+msgstr "chyba v nastavení"
 
 #: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-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ů!"
+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ů!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2660,227 +2674,10 @@ msgstr "Vítejte, %s!"
 #: plugins/generic/references/class_reference.inc:27
 #: plugins/generic/references/class_reference.inc:44
 msgid "References"
-msgstr "Odkazy"
-
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "upravit POSIXová nastavení uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Domovská složka"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Umístění domovské složky tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Který shell by měl být použit, když se uživatel přihlásí"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Hlavní skupina"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Hlavní skupina tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Stav tohoto unixového uživatelského účtu"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Vynutit konkrétní identifikátor uživatele/skupiny"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Pro tohoto uživatele vynutit konkrétní identifikátory uživatele a jeho hlavní skupiny"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "Identifikátor uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Hodnota identifikátoru účtu tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "Idenifikátor skupiny"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Hodnota identifikátoru hlavní skupiny tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Členství ve skupinách"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Účet"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Uživatel musí při prvním přihlášení změnit heslo."
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "Při prvním přihlášení musí uživatel změnit heslo (vyžaduje nastavenou hodnotu u Prodleva před vynucením změny hesla)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Prodleva před vynucením změny hesla (dny)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "Po tomto počtu dnů bude uživatel přiměn ke změně hesla (nevyplnění funkce vypíná)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Datum skončení platnosti hesla"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Datum po kterém skončí platnost hesla uživatele (nevyplnění tuto funkci vypíná)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Délka nečinnosti uživatele, po které bude účet uživatele vypnut (dny)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Po skončení platnosti hesla, jak dlouho nanejvýš může být účet nepoužíván, než dojde k jeho vypnutí (zůstane ovšem zachován). Nevyplnění tuto funkci vypíná"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Prodleva varování uživatele před skončením platnosti hesla (dny)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "Uživatel bude varován nastavený počet dnů předem před skončením platnosti hesla (nevyplnění tuto funkci vypíná)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "důvěryhodnost systémů"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "režim důvěryhodnosti"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Typ ověřování pro tyto počítače"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "vypnuto"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "plný přístup"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "umožnit přístup k těmto strojům"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Tomuto uživateli povolit připojení pouze na počítače z tohoto seznamu"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "samočinné"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "platnost skončila"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "běží čas odkladu"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "aktivní"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "platnost hesla skončila"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "heslo nelze změnit"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Vypršel časový limit při čekání na zámek – zámek bude proto nebude brán v potaz!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Skupina uživatele %s"
+msgstr "odkazy"
 
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Skupiny a role"
 
@@ -2900,21 +2697,21 @@ msgstr "Členství v rolích"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password method"
-msgstr "Metoda uložení hesla"
+msgstr "způsob uložení hesla"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password hash method to use"
 msgstr "Metoda otisku hesla"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
 #: plugins/personal/generic/paste_generic.tpl.c:14
 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)"
@@ -2926,282 +2723,304 @@ msgstr "Zopakování hesla"
 
 #: plugins/personal/generic/class_user.inc:55
 msgid "Same password as above, to avoid errors"
-msgstr "Stejné heslo jako výše, pro vyloučení chybného zadání"
+msgstr "Stejné heslo jako výše, pro vyloučení chyb"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
-msgstr "Uživatel"
+msgstr "uživatel"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Informace o uživatelském účtu"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Uživatelský účet"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
-msgstr "Osobní údaje"
+msgstr "osobní informace"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
-msgstr "Příjmení"
+msgstr "příjmení"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
-msgstr "Příjmení tohoto uživatele"
+msgstr "Příjmení uživatele"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
-msgstr "Jméno"
+msgstr "jméno"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
-msgstr "Křestní jméno tohoto uživatele"
+msgstr "Křestní jméno uživatele"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Stručný popis uživatele"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Fotografie"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Obrázek pro tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Organizační kontaktní údaje"
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
-msgstr "Umístění"
+msgstr "umístění"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
-msgstr "Stav"
+msgstr "stát"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
-msgstr "Adresa"
+msgstr "adresa"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Firemní poštovní adresa"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
-msgstr "Číslo místnosti"
+msgstr "označení místnosti"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
-msgstr "Číslo místnosti"
+msgstr "označení místnosti"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
-msgstr "Telefon"
+msgstr "telefon"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Služební telefoní číslo"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
-msgstr "Mobilní"
+msgstr "mobilní telefon"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Číslo služebního mobilního telefonu"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
-msgstr "Pager"
+msgstr "pager"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Číslo na pracovní pager"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
-msgstr "Fax"
+msgstr "fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Číslo služebního faxu"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
-msgstr "Webové stránky"
+msgstr "osobní webové stránky"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Osobní webové stránky"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Informace o účtu"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Přihlašovací jméno tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Uživatelovo heslo"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Osobní kontaktní údaje"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
-msgstr "Zobrazovaný název"
+msgstr "zobrazované jméno"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 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."
+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:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Adresa bydliště"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
-msgstr "Soukromá poštovní adresa"
+msgstr "soukromá poštovní adresa"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
-msgstr "Soukromý telefon"
+msgstr "soukromý telefon"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
-msgstr "Telefonní číslo domů"
+msgstr "telefonní číslo domů"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
-msgstr "Organizační údaje"
+msgstr "organizační informace"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titul"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
-msgstr "Titul osoby v kontextu organizace. Každý z titulů je hodnota tohoto vícehodnotového atributu"
+msgstr ""
+"Titul osoby v kontextu organizace. Každý z titulů je hodnota tohoto "
+"vícehodnotového atributu"
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
-msgstr "Organizace"
+msgstr "organizace"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
-msgstr "Oddělení"
+msgstr "oddělení"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
-msgstr "Číslo oddělení"
+msgstr "číslo oddělení"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
-msgstr "Číslo oddělení"
+msgstr "číslo oddělení"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
-msgstr "Číslo zaměstnance"
+msgstr "číslo zaměstnance"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
-msgstr "Číslo zaměstnance"
+msgstr "číslo zaměstnance"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
-msgstr "Typ zaměstnaneckého poměru"
+msgstr "typ zaměstnaneckého poměru"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
-msgstr "Nadřízený"
+msgstr "nadřízený"
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Poštovní směrovací číslo (PSČ)"
+
+#: plugins/personal/generic/class_user.inc:659
 #, 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:614
+#: plugins/personal/generic/class_user.inc:662
 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:625
+#: plugins/personal/generic/class_user.inc:673
 #, 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"
+msgstr ""
+"Je třeba, abyste počkali %d sekund než budete moci znovu měnit své heslo"
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Toto heslo už bylo nedávno použito"
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 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:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 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:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
-msgstr "Nové heslo"
+msgstr "nové heslo"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "Nové heslo nelze použít – je příliš krátké (není bezpečné)."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
-msgstr "Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí přímo na klávesnici)."
+msgstr ""
+"Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí "
+"přímo na klávesnici)."
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:28
 msgid "Statistics about users"
@@ -3253,7 +3072,7 @@ msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
 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"
@@ -3261,7 +3080,7 @@ msgstr "Nastavení funkce obnovení zapomenutého hesla"
 
 #: plugins/config/class_recoveryConfig.inc:40
 msgid "Password recovery settings"
-msgstr "Nastavení obnovy zapomenutého hesla"
+msgstr "nastavení obnovy zapomenutého hesla"
 
 #: plugins/config/class_recoveryConfig.inc:45
 msgid "Activate password recovery"
@@ -3295,7 +3114,9 @@ msgstr "Kryptografická „sůl“ pro tokeny"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Pouze bezpečnostní opatření, můžete zde zadat cokoli, třeba i nahodile zvolené znaky"
+msgstr ""
+"Pouze bezpečnostní opatření, můžete zde zadat cokoli, třeba i nahodile "
+"zvolené znaky"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3305,10 +3126,12 @@ msgstr "Umožnit používání alternativních adres"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Uživatelé budou moci pro obnovení svých hesel použít jednu ze svých alternativních adres"
+msgstr ""
+"Uživatelé budou moci pro obnovení svých hesel použít jednu ze svých "
+"alternativních adres"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "atribut použitý pro přihlašování"
 
@@ -3324,7 +3147,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"
@@ -3332,7 +3155,7 @@ msgstr "Předmět prvního e-mailu"
 
 #: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
-msgstr "[FusionDirectory] Odkaz pro obnovu hesla"
+msgstr "[FusionDirectory] odkaz pro obnovu hesla"
 
 #: plugins/config/class_recoveryConfig.inc:95
 #, php-format
@@ -3344,7 +3167,9 @@ msgstr "Tělo zprávy (první %s je přihlašovací jméno, druhé je odkaz)"
 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 "Obsah první e-mailové zprávy, poslané uživateli, když požádá o nové heslo. Pro přihlašovací jméno a obnovovací odkaz použijte %s."
+msgstr ""
+"Obsah první e-mailové zprávy, poslané uživateli, když požádá o nové heslo. "
+"Pro přihlašovací jméno a obnovovací odkaz použijte %s."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3368,7 +3193,7 @@ msgstr "Předmět druhého e-mailu"
 
 #: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
-msgstr "[FusionDirectory] Obnova ztraceného hesla proběhla úspěšně"
+msgstr "[FusionDirectory] obnova ztraceného hesla proběhla úspěšně"
 
 #: plugins/config/class_recoveryConfig.inc:114
 #, php-format
@@ -3380,7 +3205,9 @@ msgstr "Tělo zprávy (%s je přihlašovací jméno)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Obsah druhé e-mailové zprávy, poslané pro potvrzení toho, že heslo bylo změněno. Na místě přihlašovacího jména uživatele použijte %s – bude dosazeno"
+msgstr ""
+"Obsah druhé e-mailové zprávy, poslané pro potvrzení toho, že heslo bylo "
+"změněno. Na místě přihlašovacího jména uživatele použijte %s – bude dosazeno"
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3389,12 +3216,16 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Dobrý den,\n\nVaše heslo bylo změněno.\nUživatelské jméno je samozřejmě pořád stejné – %s"
+msgstr ""
+"Dobrý den,\n"
+"\n"
+"Vaše heslo bylo změněno.\n"
+"Uživatelské jméno je samozřejmě pořád stejné – %s"
 
 #: 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
@@ -3411,17 +3242,20 @@ msgstr "Vzhled a chování"
 
 #: plugins/config/class_configInLdap.inc:91
 msgid "Language"
-msgstr "Jazyk"
+msgstr "jazyk"
 
 #: plugins/config/class_configInLdap.inc:91
 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 "Jazyk aplikace. V případě nastavení na samočinný výběr nebo když nebude k dispozici, bude použit jazyk, požadovaný prohlížečem. Toto nastavení je možné změnit pro jednotlivé uživatele."
+msgstr ""
+"Jazyk aplikace. V případě nastavení na samočinný výběr nebo když nebude k "
+"dispozici, bude použit jazyk, požadovaný prohlížečem. Toto nastavení je "
+"možné změnit pro jednotlivé uživatele."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
-msgstr "Vzhled"
+msgstr "vzhled"
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme to be used"
@@ -3429,534 +3263,491 @@ 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"
 msgstr "Časová zóna, která má být použita"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Nastavení schématu"
+msgid "Core settings"
+msgstr "Základní nastavení"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Nejvyšší umožněná velikost LDAP"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Určuje počet položek, které budou ve výchozím nastavení získávány z LDAP."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Upravit zamykání"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Kontrolovat, zda aktuálně upravovaná položka nebyla mezitím změněna mimo "
+"FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Zapnout protokolování"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Protokolování událostí na straně FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr "Ověření schématu"
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Zapíná kontrolu schématu při přihlašování."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "zapnout pořizování snímků aktuálního stavu"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr "Toto umožňuje uložit určité stavy položek a později je zase obnovit."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "podstrom pro uložení snímků"
+
+#: plugins/config/class_configInLdap.inc:141
+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
 msgid "Password settings"
-msgstr "Nastavení hesel"
+msgstr "nastavení hesel"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Výchozí otisk hesla"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Výchozí otisk, který bude použit"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Vynutit výchozí otisk"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Vynutit použití výchozího otisku hesla"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "minimální délka hesla"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Minimální délka hesel uživatelů"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "O kolik je třeba, aby se hesla lišila"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 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:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "omezovat platnost uživatelský účtů na základě platnosti jejich hesel"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
-msgstr "Zapíná test stínového atributy během přihlašování k FusionDirectory a vynucuje obnovu hesla nebo uzamčení účtu"
+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:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL oblast"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr "Atribut, který ukládat v atributu userPassword"
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Základní nastavení"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Ve výpisech zobrazovat souhrn"
-
-#: plugins/config/class_configInLdap.inc:162
-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 "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:167
-msgid "Edit locking"
-msgstr "Upravit zamykání"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Kontrolovat, zda aktuálně upravovaná položka nebyla mezitím změněna mimo FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Zapnout protokolování"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Protokolování událostí na straně FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Nejvyšší umožněná velikost LDAP"
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Určuje počet položek, které budou ve výchozím nastavení získávány z LDAP."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr "Atribut, který ukládat v atributu userPassword"
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
-msgstr "Přihlašování a sezení"
+msgstr "přihlašování a relace"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 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í."
+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:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
-msgstr "Vynutit šifrované spojení"
+msgstr "vynucovat šifrované spojení"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Zapnout kontroly zabezpečení PHP z důvodu vynucení šifrovaného přístupu (https) na webové rozhraní."
+msgstr ""
+"Zapnout kontroly zabezpečení PHP z důvodu vynucení šifrovaného přístupu "
+"(https) na webové rozhraní."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
-msgstr "Varovat, pokud relace není šifrována"
+msgstr "varovat, pokud relace není šifrována"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 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:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Doba nečinnosti, po jejímž uplynutí bude relace automaticky ukončena."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Zapnout pořizování zachycených stavů"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Toto umožňuje uložit určité stavy položek a později je zase obnovit."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Základ zachyceného stavu"
-
-#: plugins/config/class_configInLdap.inc:237
-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:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Umístění klíče"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 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."
+msgstr ""
+"Umístění soukromé části klíče FusionDirectory. V tuto chvíli není používáno."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Umístění certifikátu"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 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:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Umístění certifikátu cert. autority"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 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."
+msgstr ""
+"Umístění certifikátu cert. autority. Slouží k ověření stroje s Argonaut "
+"serverem."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "Ústřední ověřovací služba (CAS)"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Zapnout CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 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:272
+#: plugins/config/class_configInLdap.inc:256
 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:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
-msgstr "Stroj"
+msgstr "stroj"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr "Stroj, na kterém je provozován CAS server"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr "Port na kterém CAS server očekává spojení"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr "Kontext CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr "Kontext CAS, který použít"
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
-msgstr "Úložiště účtů uživatelů a skupin"
+msgstr "umístění účtů uživatelů a skupin"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "atribut účtu uživatele použitý jako DN"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 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:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Vzor CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 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:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Přísná pravidla pro pojmenovávání"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 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:314
-msgid "Group/user min id"
-msgstr "Nejnižší identifikátor skupiny/uživatele"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr "Nejnižší umožněný přiřaditelný identifikátor uživatele či skupiny pro vyloučení bezpečnostních průniků s účty s identifikátorem 0 (root)."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Háček příštího identifikátoru"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr "Skript, který má být volán pro nalezení dalšího volného identifikátoru pro uživatele nebo skupiny."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Od jakého čísla začít přidělovat identifikátory uživatelů"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Kde začít s hledáním volných identifikátorů pro nové uživatele."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Od jakého čísla začít přidělovat identifikátory skupin"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Kde začít s hledáním volných identifikátorů pro nové skupiny."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Relativní rozlišený název uživatelů"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Větev, ve které jsou uloženi uživatelé."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Relativní rozlišený název skupin"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Větev, ve které jsou uloženy skupiny."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Relativní rozlišený název ACL úlohy"
 
-#: plugins/config/class_configInLdap.inc:346
+#: 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:351
-msgid "Id allocation method"
-msgstr "Metoda přiřazování identifikátorů"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Způsob přiřazování identifikátorů uživatelů/skupin"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradiční"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Rozsah unixových identifikátorů pro Samba"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Nejnižší identifikátor uživatele"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Nejnižší umožněná hodnota pro identifikátor uživatele při použití způsobu rozsahu"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Nejvyšší identifikátor uživatele"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Nejvyšší umožněná hodnota pro identifikátor uživatele při použití způsobu rozsahu"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Nejnižší identifikátor skupiny"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Nejnižší umožněná hodnota pro identifikátor skupiny při použití způsobu rozsahu"
+#: 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:372
-msgid "Pool group id max"
-msgstr "Nejvyšší identifikátor skupiny"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Nejvyšší umožněná hodnota pro identifikátor skupiny při použití způsobu rozsahu"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
-msgstr "Diagnostika"
+msgstr "diagnostika"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Zobrazit chyby"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "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."
+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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "maximální prodleva odpovědi LDAPu"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Zastavit LDAP akce pokud není obdržena odpověď v rámci zadaného počtu sekund."
+msgstr ""
+"Zastavit LDAP akce pokud není obdržena odpověď v rámci zadaného počtu "
+"sekund."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
-msgstr "Zaznamenávat statistiky LDAP"
+msgstr "zaznamenávat statistiky LDAPu"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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 "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í."
+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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
-msgstr "Úroveň podrobností diagnostických informací"
+msgstr "úroveň podrobností diagnostických informací"
 
-#: plugins/config/class_configInLdap.inc:403
+#: 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:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
-msgstr "Různé"
+msgstr "různé"
+
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "ve výpisech zobrazovat souhrny"
+
+#: 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 ""
+"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:368
+msgid "Show ACL tab on all objects"
+msgstr "Zobrazit panel ACL u všech objektů"
+
+#: 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 ""
+"Pro velmi specifická nastavení ACL práv, kde je zapotřebí udělit právo na "
+"jediném objektu."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: 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:385
+msgid "Group or role"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "háčky"
 
-#: plugins/config/class_configInLdap.inc:420
+#: 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:424
-msgid "tab"
-msgstr "panel"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: 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:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr "režim"
 
-#: plugins/config/class_configInLdap.inc:429
+#: 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:435
-msgid "cmd"
-msgstr "příkaz"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: 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:442
-msgid "Hooks"
-msgstr "háčky"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Zobrazit výstup háčku"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
-msgstr "Pokud je zapnuto, je úspěšné vykonání háčku zobrazeno uživateli prostřednictvím dialogu."
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Dostupné shelly"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "POSIX shelly, dostupné pro uživatele F.D."
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Zobrazit panel ACL u všech objektů"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-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:472
-msgid "Available department categories"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
 msgstr ""
+"Pokud je zapnuto, je úspěšné vykonání háčku zobrazeno uživateli "
+"prostřednictvím dialogu."
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
@@ -3998,7 +3789,9 @@ msgstr "Vynutit dotázání se na heslo"
 msgid ""
 "Useful if you add a hook using password value when SASL user passwords are "
 "edited"
-msgstr "Hodí se pro přidání háčku, používajícího hodnotu hesla když jsou upravována SASL uživatelská hesla"
+msgstr ""
+"Hodí se pro přidání háčku, používajícího hodnotu hesla když jsou upravována "
+"SASL uživatelská hesla"
 
 #: plugins/config/class_dashBoardConfig.inc:28
 msgid "Dashboard configuration"
@@ -4040,13 +3833,15 @@ msgstr "Počet dnů"
 msgid ""
 "Number of days before expiration needed for an account to show in the "
 "dashboard next expired accounts list"
-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"
+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/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
 #: plugins/admin/departments/class_departmentManagement.inc:34
 msgid "Departments"
-msgstr "Oddělení"
+msgstr "oddělení"
 
 #: plugins/admin/departments/class_department.inc:57
 msgid "department"
@@ -4054,9 +3849,8 @@ msgstr "oddělení"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4079,7 +3873,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
@@ -4105,7 +3899,7 @@ msgstr "Nadřízený tohoto %s"
 #: 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
 #, php-format
@@ -4114,7 +3908,7 @@ msgstr "Poštovní adresa pro toto %s"
 
 #: plugins/admin/departments/class_department.inc:106
 msgid "Telephone number"
-msgstr "Telefonní číslo"
+msgstr "telefonní číslo"
 
 #: plugins/admin/departments/class_department.inc:110
 msgid "Facsimile telephone number"
@@ -4128,7 +3922,7 @@ msgstr "organizace"
 #: 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"
@@ -4146,7 +3940,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:38
 msgid "Users and groups"
-msgstr "Uživatelé a skupiny"
+msgstr "uživatelé a skupiny"
 
 #: plugins/admin/departments/class_dcObject.inc:30
 #: plugins/admin/departments/class_dcObject.inc:31
@@ -4162,7 +3956,7 @@ msgstr "Doménová část"
 #: plugins/admin/departments/class_locality.inc:31
 #: plugins/admin/departments/class_locality.inc:34
 msgid "Locality"
-msgstr "Místo"
+msgstr "místo"
 
 #: plugins/admin/departments/class_locality.inc:51
 msgid "locality"
@@ -4170,7 +3964,7 @@ msgstr "místo"
 
 #: plugins/admin/departments/dep-list.xml:9
 msgid "List of departments"
-msgstr "Seznam oddělení"
+msgstr "seznam oddělení"
 
 #: plugins/admin/departments/class_country.inc:50
 msgid "country"
@@ -4178,78 +3972,80 @@ msgstr "zemÄ›"
 
 #: 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 ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
-msgstr "Zamykání účtu"
+msgstr "zamykání účtu"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
-msgstr "Způsob ukládání hesel %s neumožňuje uzamykání účtů. Účet %s proto nebyl uzamčen!"
+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:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
-msgstr "Odemknout účet"
+msgstr "povolit účet"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
-msgstr "Uzamknout účet"
+msgstr "zamknout účet"
 
 #: 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:127
 msgid "Lock users"
-msgstr "Zamknout uživatele"
+msgstr "zamknout uživatele"
 
 #: plugins/admin/users/user-list.xml:135
 msgid "Unlock users"
-msgstr "Odemknout uživatele"
+msgstr "odemknout uživatele"
 
 #: plugins/admin/users/user-list.xml:146
 msgid "Apply template"
-msgstr "Použít šablonu"
+msgstr "aplikovat Å¡ablonu"
 
 #: plugins/admin/users/user-list.xml:177
 msgid "New user from template"
-msgstr "Vytvořit nového uživatele pomocí šablony"
+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)}"
-msgstr ""
+msgstr "%{filter:lockLabel(userPassword)}"
 
 #: plugins/admin/users/user-list.xml:212
 msgid "Remove user"
-msgstr "Odebrat uživatele"
+msgstr "odebrat uživatele"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
-msgstr "Role"
+msgstr "úloha"
 
 #: plugins/admin/groups/class_roleGeneric.inc:56
 msgid "Role information"
@@ -4257,16 +4053,15 @@ msgstr "Informace o roli"
 
 #: plugins/admin/groups/class_roleGeneric.inc:60
 msgid "Organizational role"
-msgstr "Organizační role"
+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:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Název této skupiny"
 
@@ -4276,11 +4071,11 @@ msgstr "Popis role"
 
 #: plugins/admin/groups/class_roleGeneric.inc:95
 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"
@@ -4290,164 +4085,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Přidat uživatele pro tuto roli"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Spravovat skupiny a role"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Upravit vlastnosti role"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "POSIX"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
-msgstr "Upravit POSIXové vlastnosti"
+msgstr "upravit POSIXové vlastnosti"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Zobrazit skupiny uživatele"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Zobrazit hlavní skupiny"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
-msgstr "Zobrazit organizační role"
+msgstr "Zobrazit organizační úlohy"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Zobrazit skupiny aplikací"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "zobrazovat primární skupiny"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
-msgstr "Zobrazit e-mailové skupiny"
+msgstr "zobrazovat e-mailové skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
-msgstr "Zobrazit skupiny Samby"
+msgstr "zobrazovat skupiny Samby"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Zobrazit skupiny serverů"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Zobrazit skupiny počítačů"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Zobrazit skupiny počítačů s MS Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Zobrazit skupiny terminálů"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Zobrazit skupiny tiskáren"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Zobrazit skupiny telefonů"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Neznámý typ: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Neexistující rozlišený název: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "skupina objektu"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Informace o skupinÄ› objektu"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
-msgstr "Skupina"
+msgstr "skupina"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Stručný popis této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "členské objekty"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objekty spadající do této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr "Této skupině umožnit připojení pouze na počítače z tohoto seznamu"
-
-#: plugins/admin/groups/class_ogroup.inc:322
-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/class_ogroup.inc:215
+msgid "System trust"
+msgstr "důvěryhodnost systémů"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Seznam skupin"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "režim důvěryhodnosti"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "Informace o POSIX skupinÄ›"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Typ ověřování pro tyto stroje"
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "POSIX skupina"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "zakázáno"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr "POSIX skupina uživatelů"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "plný přístup"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Vynutit konkrétní GID identifikátor"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "povolit přístup k těmto strojům"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "Vynutit konkrétní identifikátor pro tuto skupinu"
+#: plugins/admin/groups/class_ogroup.inc:226
+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_group.inc:73
-msgid "GID value for this group"
-msgstr "GID identifikátor pro tuto skupinu"
+#: plugins/admin/groups/class_ogroup.inc:317
+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/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Členové skupiny"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "seznam skupin"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4283,6 @@ msgstr "Dialog přiřazení ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Dialog přiřazení úloh řízení přístupu"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Režim"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Týká se toto celého podstromu nebo jen základu?"
@@ -4527,11 +4310,11 @@ msgstr "Použít tento ACL seznam pro všechny uživatele LDAP"
 #: plugins/admin/acl/class_aclAssignment.inc:56
 #: ihtml/themes/breezy/acl.tpl.c:32
 msgid "Members"
-msgstr "Členové"
+msgstr "členové"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 msgid "Users or groups to assign this role to."
-msgstr "Uživatelé či skupiny, kterým má být přiřazena tato role"
+msgstr "Uživatelé či skupiny, kterým má být tato role přiřazena"
 
 #: plugins/admin/acl/class_aclAssignment.inc:190
 #, php-format
@@ -4598,31 +4381,31 @@ msgstr "číst"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:260
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:358
 msgid "write"
-msgstr "Zápis"
+msgstr "zapisovat"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:344
 msgid "Show/hide advanced settings"
-msgstr "Zobrazit/skrýt pokročilá nastavení"
+msgstr "zobrazit/skrýt pokročilá nastavení"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:349
 msgid "Create objects"
-msgstr "Vytvářet objekty"
+msgstr "vytvářet objekty"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Move objects"
-msgstr "Přesunout objekty"
+msgstr "přesouvat objekty"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Remove objects"
-msgstr "Odstranit objekty"
+msgstr "mazat objekty"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:353
 msgid "Grant permission to owner"
-msgstr "Udělit oprávnění vlastníkovi"
+msgstr "dát oprávnění i vlastníkovi"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:362
 msgid "Complete object"
-msgstr "Celý objekt"
+msgstr "celý objekt"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:35
 msgid "ACL roles management"
@@ -4635,7 +4418,7 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclRole.inc:38
 #, php-format
 msgid "Contains settings for these objects: %s"
-msgstr "Obsahuje nastavení pro tyto objekty: %s"
+msgstr "obsahuje nastavení pro následující objekty: %s"
 
 #: plugins/admin/aclrole/class_aclRole.inc:78
 msgid "Access control roles"
@@ -4647,11 +4430,11 @@ msgstr "Role ACL"
 
 #: plugins/admin/aclrole/class_aclRole.inc:99
 msgid "A name for this role"
-msgstr "Název této role"
+msgstr "Název této úlohy"
 
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Short description of this role"
-msgstr "Stručný popis této role"
+msgstr "Stručný popis této úlohy"
 
 #: plugins/admin/aclrole/class_aclRole.inc:109
 msgid "ACLs"
@@ -4671,28 +4454,32 @@ msgstr "FusionDirectory bude fungovat i tak."
 
 #: setup/setup_migrate_adminAccount.tpl.c:2
 msgid "Create a new FusionDirectory administrator account"
-msgstr "Vytvořit nový správcovský účet pro FusionDirectory"
+msgstr "vytvořit nový správcovský účet pro FusionDirctory"
 
 #: setup/setup_migrate_adminAccount.tpl.c:5
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Tento dialog automaticky přidá nového super správce do vašeho LDAP stromu."
+msgstr ""
+"tento dialog automaticky přidá nového super správce do Vašeho LDAP stromu."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
-msgstr "Identifikátor uživatele"
+msgstr "ID uživatele"
 
 #: setup/setup_migrate_adminAccount.tpl.c:17
 msgid "Password (again)"
-msgstr "Heslo (zopakování)"
+msgstr "heslo (zopakování)"
 
 #: setup/setup_welcome.tpl.c:2
 msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Zdá se, že toto je první spuštění FusionDirectory – není k dispozici jakékoli nastavení. Tento jednoduchý průvodce se vám pokusí pomoci s jeho vytvořením."
+msgstr ""
+"Zdá se, že toto je první spuštění FusionDirectory – není k dispozici "
+"jakékoli nastavení. Tento jednoduchý průvodce se pokusí pomoci Vám s jeho "
+"vytvořením."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4700,19 +4487,21 @@ msgstr "Co pro Vás tento průvodce udělá?"
 
 #: setup/setup_welcome.tpl.c:8
 msgid "Create a basic, single site configuration"
-msgstr "Vytvořit základní nastavení pro jednu organizaci"
+msgstr "vytvoří základní nastavení pro jedinou organizaci"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr "Pokusí se najít problémy, které by mohly existovat ve Vaší instalaci PHP a LDAP"
+msgstr ""
+"pokusí se najít problémy, které by mohly existovat ve Vaší instalaci PHP a "
+"LDAPu"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr "Nechá vás vybrat ze základních a pokročilých voleb nastavení"
+msgstr "poskytne Vám přístup k základním i pokročilým volbám nastavení"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
-msgstr "Asistovaný převod stávajících stromů v LDAP databázi"
+msgstr "poskytne asistenci při migraci stávajících stromů LDAPu"
 
 #: setup/setup_welcome.tpl.c:20
 msgid "What will the wizard NOT do for you?"
@@ -4720,11 +4509,13 @@ 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 v nastavení."
+msgstr "Nalézt všechny případné chyby."
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Provést přechod ze všech možných uspořádání LDAP adresáře – než začnete, vždy proveďte zálohu!"
+msgstr ""
+"provést migraci všech možných variant LDAP adresáře – než začnete, vždy si "
+"udělejte zálohu!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4735,78 +4526,95 @@ msgid ""
 "For security reasons you need to authenticate for the installation by "
 "creating the file '%1', containing the current session ID on the servers "
 "local filesystem. This can be done by executing the following command:"
-msgstr "Z bezpečnostních důvodů je třeba, abyste instalačnímu procesu prokázali své oprávnění vytvořením souboru %1 na souborovém systému serveru, do kterého zapíšete identifikátor tohoto sezení. Můžete tak učinit spuštěním následujícího příkazu (na serveru):"
+msgstr ""
+"Z bezpečnostních důvodů je třeba, abyste instalačnímu procesu prokázali své "
+"oprávnění vytvořením souboru %1 na souborovém systému serveru, do kterého "
+"zapíšete identifikátor tohoto sezení. Můžete tak učinit spuštěním "
+"následujícího příkazu (na serveru):"
 
 #: 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 hotovi, klikněte na tlačítko \"Další\"."
 
 #: setup/setup_migrate_baseOC.tpl.c:2
 msgid "Add required object classes to the LDAP base"
 msgstr "přidejte do LDAPu potřebné třídy objektů"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
-msgstr "Stávající"
+msgstr "současné"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
-msgstr "Po přemístění"
+msgstr "po migraci"
 
 #: setup/setup_migrate_baseOC.tpl.c:14
 msgid "Close"
-msgstr "Zavřít"
+msgstr "zavřít"
+
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Během kontroly LDAPu bude zjišťováno, zda zde existují případné běžně se "
+"vyskytující nedostatky, na které lze narazit při přechodu na správu LDAPu "
+"pomocí FusionDirectory. Pro docílení bezproblémového chodu služeb bude dobré"
+" odstranit níže uvedené problémy."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "zkontrolovat znovu"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
-msgstr "Tento dialog umožňuje přesunout vícero položek do příslušného stromu. Je tak možné zpřehlednit uspořádání LDAP databáze."
+msgstr ""
+"Tento dialog umožňuje přesunout vícero položek do příslušného stromu. Je tak"
+" možné zpřehlednit uspořádání LDAP databáze."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
-msgstr "U této volby buďte opatrní! Na tyto položky mohou existovat odkazy. Ty nemohou být instalátorem FusionDirectory přemístěny – takže pokud takové odkazy skutečně existují, v takovém případě bude nejlépe přemisťování zrušit. "
+msgstr ""
+"U této volby buďte opatrní! Na tyto položky mohou existovat odkazy. Ty "
+"nemohou být instalátorem FusionDirectory přemístěny – takže pokud takové "
+"odkazy skutečně existují, v takovém případě bude nejlépe přemisťování "
+"zrušit. "
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Přesunout označené položky do tohoto stromu"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
-msgstr "Uvedené položky jsou nyní viditelné v rozhraní FusionDirectory. Pokud to chcete u některých položek změnit, pak je jednoduše označte a klikněte na Přemístit."
+msgstr ""
+"Uvedené položky jsou nyní viditelné v rozhraní FusionDirectory. Pokud to "
+"chcete u některých položek změnit, pak je jednoduše označte a klikněte na "
+"Přemístit."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Náhled toho, co s vybranými položkami stane po migraci, lze získat z LDIFu po kliknutí na 'zobrazit změny'."
+msgstr ""
+"Náhled toho, co s vybranými položkami stane po migraci, lze získat z LDIFu "
+"po kliknutí na 'zobrazit změny'."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
-msgstr "Zobrazit změny"
-
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Během kontroly LDAPu bude zjišťováno, zda zde existují případné běžně se vyskytující nedostatky, na které lze narazit při přechodu na správu LDAPu pomocí FusionDirectory. Pro docílení bezproblémového chodu služeb bude dobré odstranit níže uvedené problémy."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Zkontrolovat znovu"
+msgstr "zobrazit změny"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
-msgstr "Uložit nastavení do souboru"
+msgstr "Vytvořte si svůj soubor s nastaveními."
 
 #: setup/setup_finish.tpl.c:5
 msgid "Run %1 to put the correct right on fusiondirectory.conf"
@@ -4814,21 +4622,21 @@ 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 nastavení"
 
 #: setup/setup_finish.tpl.c:11
 msgid "Status: "
-msgstr "Stav: "
+msgstr "stav: "
 
 #: include/select/groupSelect/group-filter.tpl.c:2
 #: ihtml/themes/breezy/simple-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 msgid "Filter"
-msgstr "Filtr"
+msgstr "filtr"
 
 #: ihtml/themes/breezy/recovery.tpl.c:8
 msgid "Lost password"
-msgstr "Ztracené heslo"
+msgstr "ztracené heslo"
 
 #: ihtml/themes/breezy/recovery.tpl.c:11
 msgid "Information to reset password for %1 has been sent to email address %2"
@@ -4842,7 +4650,9 @@ msgstr ""
 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'."
+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
@@ -4853,23 +4663,23 @@ msgstr "adresář"
 
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
-msgstr "Zopakování nového hesla"
+msgstr "nové heslo znovu"
 
 #: ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
-msgstr "Odolnost hesla"
+msgstr "odolnost hesla"
 
 #: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
 msgid "Change"
-msgstr "Změnit"
+msgstr "změnit"
 
 #: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
 msgid "Click here to change your password"
-msgstr "Pro změnu hesla klikněte sem"
+msgstr "pro změnu hesla klikněte sem"
 
 #: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
 msgid "Success"
-msgstr "Úspěch"
+msgstr "úspěch"
 
 #: ihtml/themes/breezy/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
@@ -4879,7 +4689,8 @@ msgstr "Vaše heslo bylo úspěšně změněno."
 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."
+msgstr ""
+"Do políčka níže zadejte svou e-mailovou adresu a klikněte na  'změnit'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:62
 msgid ""
@@ -4895,34 +4706,38 @@ msgstr "E-mail"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "Funkce pro obnovení zapomenutého hesla není zapnutá. Pokud jste ztratili své heslo, kontaktujte svého správce systémů"
+msgstr ""
+"Funkce pro obnovení zapomenutého hesla není zapnutá. Pokud jste ztratili své"
+" heslo, kontaktujte svého správce systémů"
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
-msgstr "Přihlašovací obrazovka"
+msgstr "přihlašovací obrazovka"
 
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr "Zadejte své uživatelské jméno a heslo pro přihlášení do správy systémů tohoto místa."
+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"
+msgstr "uživatelské jméno"
 
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
-msgstr "Nemohu si vzpomenout své heslo"
+msgstr "Mé heslo bylo zapomenuto"
 
 #: ihtml/themes/breezy/login.tpl.c:38
 msgid "Sign in"
-msgstr "Přihlásit"
+msgstr "přihlásit"
 
 #: ihtml/themes/breezy/login.tpl.c:41
 msgid "Click here to log in"
-msgstr "Přihlaste se kliknutím sem"
+msgstr "pro přihlášení klikněte sem"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:2
 msgid ""
@@ -4930,25 +4745,32 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "Omezování velikosti napomáhá k zlepšení odezvy LDAPu a chrání server před přílišným zatížením. Nejjednodušším způsobem, jak zacházet s velkými databázemi bez dlouhých odezev, je omezit hledání na menší hodnoty a pro získávání položek, které chcete, využívat filtry."
+msgstr ""
+"Omezování velikosti napomáhá k zlepšení odezvy LDAPu a chrání server před "
+"přílišným zatížením. Nejjednodušším způsobem, jak zacházet s velkými "
+"databázemi bez dlouhých odezev, je omezit hledání na menší hodnoty a pro "
+"získávání položek, které chcete, využívat filtry."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
-msgstr "Zvolte, jak reagovat během tohoto sezení"
+msgstr "zvolte prosím, jak reagovat během této relace"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignorovat tuto chybu a zobrazit všechny položky, které LDAP server poskytne"
+msgstr ""
+"ignorovat tuto chybu a zobrazit všechny položky, které LDAP server poskytne"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "Ignorovat tuto chybu a zobrazit všechny položky, které nejsou větší než zadaný limit – jako náhradu si vystačím s filtry."
+msgstr ""
+"Ignorovat tuto chybu a zobrazit všechny položky, které nejsou větší než "
+"zadaný limit – jako náhradu si vystačím s filtry."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
-msgstr "Nastavit"
+msgstr "nastavit"
 
 #: ihtml/themes/breezy/simple-remove.tpl.c:2
 msgid "Warning: you are about to delete the following objects"
@@ -4959,29 +4781,35 @@ msgstr "Varování: chystáte se smazat následující objekty"
 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)!"
+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
 #: ihtml/themes/breezy/remove.tpl.c:8
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy – pokud jste si jistí, klikněte na Smazat. V opačném případě operaci zrušte kliknutím na Zrušit."
+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/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:"
-msgstr "Přihlášeni:"
+msgstr "přihlášen(a):"
 
 #: ihtml/themes/breezy/framework.tpl.c:11
 #, c-format
 msgid "Session expires in %d!"
-msgstr "Platnost relace skončí za %d!"
+msgstr "Relace vyprší za %d!"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
@@ -4989,21 +4817,25 @@ msgstr "Varování: chystáte se obnovit následující zachycený stav"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:5
 msgid "Any modification made to the object since this snapshot will be lost."
-msgstr "Jakékoli úpravy, učiněné na tomto objektu od doby pořízení tohoto zachyceného stavu, budou ztraceny."
+msgstr ""
+"Jakékoli úpravy, učiněné na tomto objektu od doby pořízení tohoto "
+"zachyceného stavu, budou ztraceny."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:11
 msgid ""
 "So - if you're sure - press 'Continue' to continue or 'Cancel' to abort."
-msgstr "Takže, pokud to tak opravdu chcete, klikněte na Pokračovat. V opačném případě celou operaci zrušte kliknutím na Storno."
+msgstr ""
+"Takže, pokud to tak opravdu chcete, klikněte na Pokračovat. V opačném "
+"případě celou operaci zrušte kliknutím na Storno."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:14
 #: ihtml/themes/breezy/template.tpl.c:8
 msgid "Continue"
-msgstr "Pokračovat"
+msgstr "pokračovat"
 
 #: ihtml/themes/breezy/islocked.tpl.c:2
 msgid "Locking conflict detected"
-msgstr "Zjištěn konflikt při vyhrazování prostředků."
+msgstr "Zjištěn konflikt při vyhrazování prostředků (zamykání)."
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
 msgid "\"%1\" has been locked by \"%2\" since %3"
@@ -5018,7 +4850,7 @@ msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
-msgstr "Pouze pro čtení"
+msgstr "pouze pro čtení"
 
 #: ihtml/themes/breezy/remove.tpl.c:5
 msgid ""
@@ -5028,28 +4860,36 @@ msgstr ""
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:2
 msgid "Copy & paste wizard"
-msgstr "Průvodce pro zkopíruj a vlož"
+msgstr "průvodce pro zkopíruj a vlož"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:5
 msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Některé hodnoty musí být jedinečné v rámci celého adresáře, některé kombinace jsou zase nesmyslné. FusionDirectory zobrazuje příslušné atributy. Upravte prosím níže uvedené hodnoty tak, aby odpovídaly těmto pravidlům."
+msgstr ""
+"Některé hodnoty musí být jedinečné v rámci celého adresáře, některé "
+"kombinace jsou zase nesmyslné. FusionDirectory zobrazuje příslušné atributy."
+" Upravte prosím níže uvedené hodnoty tak, aby odpovídaly těmto pravidlům."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Pamatujte, že některé vlastnosti, jako například záznam o pořízených snímcích, nebudou zkopírovány!"
+msgstr ""
+"Pamatujte, že některé vlastnosti, jako například záznam o pořízených "
+"snímcích, nebudou zkopírovány!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Případně když během kopírováním či přesouvání objektu v rámci FusionDirectory smažete zdrojový objekt, může to vést k selhání vkládání objektů do nového umístění!"
+msgstr ""
+"Případně když během kopírováním či přesouvání objektu v rámci "
+"FusionDirectory smažete zdrojový objekt, může to vést k selhání vkládání "
+"objektů do nového umístění!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
-msgstr "Operace byla dokončena"
+msgstr "operace byla dokončena"
 
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
@@ -5081,11 +4921,11 @@ msgstr "použít členy z"
 
 #: ihtml/themes/breezy/acl.tpl.c:23
 msgid "Available members"
-msgstr "Členové k dispozici"
+msgstr "dostupní členové"
 
 #: ihtml/themes/breezy/acl.tpl.c:26 ihtml/themes/breezy/acl.tpl.c:29
 msgid "List message possible targets"
-msgstr "Vypsat možné cíle zprávy"
+msgstr "vypsat možné cíle zprávy"
 
 #: ihtml/themes/breezy/acl.tpl.c:35 ihtml/themes/breezy/acl.tpl.c:38
 msgid "List message recipients"
@@ -5097,11 +4937,11 @@ msgstr "ACL pro tento objekt"
 
 #: ihtml/themes/breezy/acl.tpl.c:47
 msgid "Available roles"
-msgstr "Role k dispozici"
+msgstr "dostupné role"
 
 #: plugins/generic/welcome/welcome.tpl.c:2
 msgid "The FusionDirectory team"
-msgstr "Kolektiv tvůrců FusionDirectory"
+msgstr "tým tvůrců FusionDirectory"
 
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
@@ -5111,63 +4951,67 @@ msgstr "<strong>%1</strong> odkazuje na naši <strong>%3</strong>"
 msgid ""
 "<strong>%1</strong> references our field <strong>%3</strong> from tab "
 "<strong>%2</strong>"
-msgstr "<strong>%1</strong> odkazuje na naše políčko <strong>%3</strong> z panelu <strong>%2</strong>"
+msgstr ""
+"<strong>%1</strong> odkazuje na naše políčko <strong>%3</strong> z panelu "
+"<strong>%2</strong>"
 
 #: plugins/generic/references/contents.tpl.c:8
 msgid "This object has no relationship to other objects."
-msgstr "Tento objekt nemá žádnou návaznost na další objekty."
+msgstr "tento objekt nemá žádné propojení s dalšími objekty"
 
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
-msgstr "Nastavení uživatele"
+msgstr "nastavení uživatele"
 
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
-msgstr "Odstranit heslo"
+msgstr "odebrat heslo"
 
 #: plugins/personal/generic/paste_generic.tpl.c:20
 msgid "Set new password"
-msgstr "Nastavit nové heslo"
+msgstr "nastavit nové heslo"
 
 #: plugins/personal/generic/paste_generic.tpl.c:23
 msgid "Personal picture"
-msgstr "Fotografie"
+msgstr "fotografie"
 
 #: plugins/personal/generic/paste_generic.tpl.c:26
 msgid "User picture"
-msgstr "Fotografie uživatele"
+msgstr "fotografie uživatele"
 
 #: plugins/personal/generic/paste_generic.tpl.c:29
 msgid "Remove picture"
-msgstr "Odebrat fotografii"
+msgstr "odebrat fotografii"
 
 #: plugins/personal/generic/nochange.tpl.c:2
 msgid "You have no permission to change your password at this time"
-msgstr "V tomto okamžiku nejste oprávněni změnit si své heslo."
+msgstr "V tomto okamžiku nejste oprávněn(a) změnit si své heslo."
 
 #: plugins/personal/generic/nochange.tpl.c:5
 msgid "Your password hash method will not be changed!"
-msgstr "Metoda otisku hesla nebyla změněna!"
+msgstr "Způsob uložení Vašeho hesla nebyl změněn!"
 
 #: plugins/personal/generic/changed.tpl.c:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Vaše heslo bylo úspěšně změněno. Nezapomeňte změnit též jeho případnou uloženou podobu ve všech aplikacích, které se jím někam přihlašují."
+msgstr ""
+"Vaše heslo bylo úspěšně změněno. Nezapomeňte ho změnit též ve všech "
+"aplikacích, které ho používají."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
 msgid_plural "There are %1 groups:"
-msgstr[0] "Je zde 1 skupina:"
-msgstr[1] "Jsou zde %1 skupiny:"
-msgstr[2] "Je zde %1 skupin:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] "Jedna z nich je %1 skupina"
-msgstr[1] "%2 jsou %1 skupiny"
-msgstr[2] "%2 je %1 skupin"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "There is no %1 group"
@@ -5177,16 +5021,16 @@ msgstr "Není zde žádná %1 skupina"
 #: plugins/addons/dashboard/pwd_stats.tpl.c:2
 msgid "There is 1 user:"
 msgid_plural "There are %1 users:"
-msgstr[0] "Je zde jeden uživatel:"
-msgstr[1] "Jsou zde %1 uživatelé:"
-msgstr[2] "Je zde %1 uživatelů:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-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[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "None of them have a %1 account"
@@ -5202,9 +5046,9 @@ msgstr[2] ""
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] "Jeden z nich je uzamčen"
-msgstr[1] "%1 z nich jsou uzamčené"
-msgstr[2] "%1 z nich je uzamčených"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
@@ -5213,9 +5057,9 @@ msgstr "Žádný z nich není uzamčen"
 #: plugins/addons/dashboard/users_accounts.tpl.c:2
 msgid "There is one expired account"
 msgid_plural "There are %1 expired accounts"
-msgstr[0] "Je zde jeden účet, kterému skončila platnost"
-msgstr[1] "Jsou zde %1 účty, kterým skončila platnost"
-msgstr[2] "Je zde %1 účtů, kterým skončila platnost"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:5
 msgid "There is no expired account"
@@ -5261,9 +5105,9 @@ msgstr "E-mail"
 #: plugins/addons/dashboard/users_accounts.tpl.c:35
 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] "Je zde jeden účet, kterému končí platnost v příštích %1 dnech"
-msgstr[1] "Jsou zde %2 účty, kterým končí platnost v příštích %1 dnech"
-msgstr[2] "Je zde %2 účtů, kterým končí platnost v příštích %1 dnech"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:38
 msgid "There is no account expiring in the next %1 days"
@@ -5275,7 +5119,7 @@ msgstr "Další účty, kterým skončila platnost"
 
 #: 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"
@@ -5303,8 +5147,10 @@ msgstr ""
 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 "Toto zahrnuje všechna ACL přiřazení na těchto uzlech. Pokud chcete vypsat seznam těchto přiřazení, zrušte toto a otevřete si objekty."
+msgstr ""
+"Toto zahrnuje všechna ACL přiřazení na těchto uzlech. Pokud chcete vypsat "
+"seznam těchto přiřazení, zrušte toto a otevřete si objekty."
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Pokračujte kliknutím na Smazat nebo akci zrušte kliknutím na Zrušit."
+msgstr "Pro pokračování stiskněte \"Smazat\", pro přerušení \"Zrušit\"."
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index a115519bc3ee8da8d5ade5e7034adfcf78a26f64..918b1ff029ed82de8882fb0805d322e68cc680ff 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -1,943 +1,891 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Sprachauswahl"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Dieser Schritt erlaubt es Ihnen, Ihre bevorzugte Sprache auszuwählen."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr "LDAP-Verbindung"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Name des Standortes"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "Verbindungs-URI"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS-Verbindung"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Basis"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "Die LDAP-Verzeichnisbasis"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Authentisierung"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Administrator-DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Administrator-Passwort:"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Momentaner Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "LDAP-Einrichtung"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Einrichten der LDAP-Verbindung"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Dieser Dialog leistet die grundlegende Konfiguration der LDAP-Konnektivität "
+"für FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonyme Anmeldung an server '%s' ist fehlgeschlagen!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Verbindung als Benutzer '%s' ist fehlgeschlagen!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Wiederholen"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Verbindung als anonymer Benutzer zu Server '%s' war erfolgreich."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Bitte geben Sie Ihren Benutzer und das zugehörige Passwort ein!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Verbindung als Benutzer '%s' zu Server '%s' war erfolgreich!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Warnung"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Einrichtungsfehler"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Vor"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Willkommen"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Speichern"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Abschluß - Schreiben der Konfigurationsdatei"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Schreibe Konfigurationsdatei"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Ihre Konfigurationsdatei ist momentan für jeden lesbar. Bitte ändern Sie die"
+" Zugriffsrechte!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Die Konfiguration ist momentan nicht lesbar oder existiert nicht."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Nach dem Herunterladen und dem Plazieren der Datei unter %s, bitte "
+"vergewissern Sie sich dass der Benutzer unter dem der Webserver läuft, in "
+"der Lage ist %s zu lesen. Anderen Nutzern sollte dies nicht möglich sein."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "PHP Modul- und Erweiterungsprüfung"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
-msgstr "PHP-Einrichtungskonfiguration (<a href=\"?info\" target=\"_blank\">Information anzeigen)</a>)"
+msgstr ""
+"PHP-Einrichtungskonfiguration (<a href=\"?info\" "
+"target=\"_blank\">Information anzeigen)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Installationsprüfung"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Grundlegende Überprüfungen der PHP-Version und Erweiterungen."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Prüfe PHP-Version"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
-msgstr "PHP muss in Version %s oder höher vorliegen."
+msgstr "PHP muß in Version %s oder höher vorliegen."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Bitte aktualisieren Sie auf eine unterstützte Version."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory benötigt dieses Modul um mit Ihrem LDAP-Server zu kommunizieren."
+msgstr ""
+"FusionDirectory benötigt dieses Modul um mit Ihrem LDAP-Server zu "
+"kommunizieren."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory benötigt dieses Modul für internationalisierte Schnittstellen."
+msgstr ""
+"FusionDirectory benötigt dieses Modul für internationalisierte "
+"Schnittstellen."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory benötigt dieses Modul um mit den unterschiedlichen Arten von Servern und Protokollen zu kommunizieren."
+msgstr ""
+"FusionDirectory benötigt dieses Modul um mit den unterschiedlichen Arten von"
+" Servern und Protokollen zu kommunizieren."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory benötigt dieses Modul für die Sambaintegration."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory benötigt entweder 'mhash' oder das 'sha1' Modul um SSHA-Verschlüsselung nutzen zu können."
+msgstr ""
+"FusionDirectory benötigt entweder 'mhash' oder das 'sha1' Modul um SSHA-"
+"Verschlüsselung nutzen zu können."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory benötigt dieses Modul um mit einem IMAP-Server zu kommunizieren."
+msgstr ""
+"FusionDirectory benötigt dieses Modul um mit einem IMAP-Server zu "
+"kommunizieren."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr "FusionDirectory benötigt dieses Modul um Unicode-Zeichenketten zu verwalten."
+msgstr ""
+"FusionDirectory benötigt dieses Modul um Unicode-Zeichenketten zu verwalten."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "Imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory benötigt diese Erweiterung um Bilder zu verarbeiten."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "Komprimierungs-Modul"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory benötigt diese Erweiterung um Snapshots zu verwalten."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals ist ein PHP-Mechanismus, welcher alle globalen Variablen für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein."
+msgstr ""
+"register_globals ist ein PHP-Mechanismus, welcher alle globalen Variablen "
+"für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Suchen Sie nach 'register_globals' in Ihrer php.ini und setzen Sie es auf 'Off'."
+msgstr ""
+"Suchen Sie nach 'register_globals' in Ihrer php.ini und setzen Sie es auf "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP verwendet diese Einstellungen für den Garbage Collector, um alte Sessions zu entfernen."
+msgstr ""
+"PHP verwendet diese Einstellungen für den Garbage Collector, um alte "
+"Sessions zu entfernen."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Wenn Sie diesen Wert auf einen Tag setzen, wird dies vermeiden, dass Sie die Sitzung und den zugehörigen Cookie verlieren, bevor diese tatsächlich ihre Gültigkeit verlieren."
+msgstr ""
+"Wenn Sie diesen Wert auf einen Tag setzen, wird dies vermeiden, dass Sie die"
+" Sitzung und den zugehörigen Cookie verlieren, bevor diese tatsächlich ihre "
+"Gültigkeit verlieren."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Suchen Sie in Ihrer php.ini nach 'session.gc_maxlifetime' und setzen Sie es auf 84600 oder höher."
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'session.gc_maxlifetime' und setzen Sie es "
+"auf 84600 oder höher."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Aus"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Um FusionDirectory ohne Probleme benutzen zu können, muss die Option session.auto_start in Ihrer php.ini auf 'Off' gestellt werden."
+msgstr ""
+"Um FusionDirectory ohne Probleme benutzen zu können, muss die Option "
+"session.auto_start in Ihrer php.ini auf 'Off' gestellt werden."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Suchen Sie in Ihrer php.ini nach 'session.auto_start' und setzen Sie es auf 'Off'."
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'session.auto_start' und setzen Sie es auf "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory benötigt mindestens 128MB Arbeitsspeicher. Wird dieser Wert unter dieses Limit gesetzt, kann dies unreproduzierbare Fehler hervorrufen. Erhöhen Sie dies für größere Installationen."
+msgstr ""
+"FusionDirectory benötigt mindestens 128MB Arbeitsspeicher. Wird dieser Wert "
+"unter dieses Limit gesetzt, kann dies unreproduzierbare Fehler hervorrufen. "
+"Erhöhen Sie dies für größere Installationen."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Suchen nach 'memory_limit' in Ihrer php.ini und setzen auf '128M' oder höher."
+msgstr ""
+"Suchen nach 'memory_limit' in Ihrer php.ini und setzen auf '128M' oder "
+"höher."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie diese auf 'off', um die Leistung zu erhöhen."
+msgstr ""
+"Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
+"diese auf 'off', um die Leistung zu erhöhen."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr "Suchen Sie in Ihrer php.ini nach 'implicit_flush' und setzen Sie es auf 'Off'."
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'implicit_flush' und setzen Sie es auf "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Die Ausführungszeit sollte mindestens 30 Sekunden betragen."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf '30' oder höher."
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf "
+"'30' oder höher."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Erhöhen Sie die Sicherheit Ihres Servers, indem Sie expose_php auf 'off' setzen. PHP wird in dieser Einstellung keine Informationen über Ihren laufenden Server senden."
+msgstr ""
+"Erhöhen Sie die Sicherheit Ihres Servers, indem Sie expose_php auf 'off' "
+"setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
+"laufenden Server senden."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr "Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Erhöhen Sie die Leistung des Servers, indem sie magic_quotes_gpc auf 'off' stellen."
+msgstr ""
+"Erhöhen Sie die Leistung des Servers, indem sie magic_quotes_gpc auf 'off' "
+"stellen."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen Sie es auf 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Willkommen"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Willkommen im FusionDirectory Einrichtungsassistent"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Die Willkommensnachricht"
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen "
+"Sie es auf 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrieren"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "LDAP-Inspektion"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
-msgstr "Analysieren Sie Ihr aktuelles LDAP nach Kompatibilität mit FusionDirectory"
+msgstr ""
+"Analysieren Sie Ihr aktuelles LDAP nach Kompatibilität mit FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Prüfe Objekt-Klassen des Wurzelobjektes"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Prüfe Berechtigungen auf die LDAP-Datenbank"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Prüfe auf unsichtbare Benutzer"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Prüfe auf Superadministrator"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Prüfe auf Benutzer ausserhalb des Benutzerbaums"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Prüfe auf Gruppen ausserhalb des Gruppenbaums"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Prüfe auf unsichtbare Abteilungen"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Prüfe auf doppelte UID Nummern"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "LDAP-Abfrage fehlgeschlagen."
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Fehlende FusionDirectory Objektklasse '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Bitte überprüfen Sie Ihre Installation."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert "
+"werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Warnung"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "%s Benutzer(innen) gefunden, die nicht in FusionDirectory sichtbar sein werden oder unvollständig sind."
+msgstr ""
+"%s Benutzer(innen) gefunden, die nicht in FusionDirectory sichtbar sein "
+"werden oder unvollständig sind."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Benutzermigration"
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Migrationsfehler"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Kann Eintrag \"%s\" nicht migrieren:"
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Anlegen"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Benutzer"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Gruppen"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Rollen"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Es gibt kein FusionDirectory Administratorkonto innerhalb Ihres LDAP."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Anlegen"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Gibt alle Rechte auf alle Objekte"
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Fehler"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Einige Standard-ACL-Rollen fehlen"
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Kann ACL-Rolle \"%s\" nicht hinzufügen:"
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
-msgstr "Benutzer in den konfigurierten Benutzerbaum verschieben"
+msgstr "Verschiebe Benutzer in den konfigurierten Benutzerbaum"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "Eintrag wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "an"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Die folgenden Referenzen werden aktualisiert"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
+msgstr ""
+"Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Gruppen in den konfigurierten Gruppenbaum verschieben"
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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."
+msgstr ""
+"Fand %s Abteilungen, die nicht in FusionDirectory sichtbar sein werden."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr "LDAP-Verbindung"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Name des Standortes"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "Verbindungs-URI"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS-Verbindung"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "Die LDAP-Verzeichnisbasis"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Authentisierung"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Administrator-DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Administrator-Passwort:"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Momentaner Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "LDAP-Einrichtung"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Einrichten der LDAP-Verbindung"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Dieser Dialog leistet die grundlegende Konfiguration der LDAP-Konnektivität für FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonyme Anmeldung an server '%s' ist fehlgeschlagen!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Verbindung als Benutzer '%s' ist fehlgeschlagen!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Wiederholen"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Verbindung als anonymer Benutzer zu Server '%s' war erfolgreich."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Bitte geben Sie Ihren Benutzer und das zugehörige Passwort ein!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Verbindung als Benutzer '%s' zu Server '%s' war erfolgreich!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Speichern"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Abschluß - Schreiben der Konfigurationsdatei"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Schreibe Konfigurationsdatei"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Ihre Konfigurationsdatei ist momentan für jeden lesbar. Bitte ändern Sie die Zugriffsrechte!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Die Konfiguration ist momentan nicht lesbar oder existiert nicht."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Nach dem Herunterladen und dem Plazieren der Datei unter %s, bitte vergewissern Sie sich dass der Benutzer unter dem der Webserver läuft, in der Lage ist %s zu lesen. Anderen Nutzern sollte dies nicht möglich sein."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Einrichtungsfehler"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Abgeschlossen"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Willkommen im FusionDirectory Einrichtungsassistent"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Vor"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Die Willkommensnachricht"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Protokollieren fehlgeschlagen: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "Der angegebene Objekt-Typ ist leer oder ungültig!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "unkonfiguriert"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Filter Fehler"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Der Filter ist unvollständig!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "Es wurde keine TAB-Definition für '%s' in der Konfigurationsdatei gefunden. Kann keine Plugin-Instanz erzeugen!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Ãœbertragen"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Auf"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Ab"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr "Aufsteigend sortieren"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr "Absteigend sortieren"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Fehler"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "Angelegt von"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Aktionen"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Schwerer Fehler"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "in"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "in Zeile"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "XML-Fehler"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +897,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
@@ -978,310 +926,306 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren Administrator."
+msgstr ""
+"Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
+"Administrator."
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Berechtigung"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Alle abbrechen"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Kennung"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Vorlage"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Name der Vorlage"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Schwerer Fehler: keine Klassenfundorte definiert - bitte führen Sie '%s' aus, um das Problem zu beheben"
+msgstr ""
+"Schwerer Fehler: keine Klassenfundorte definiert - bitte führen Sie '%s' "
+"aus, um das Problem zu beheben"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie '%s' aus um das Problem zu beheben"
+msgstr ""
+"Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie "
+"'%s' aus um das Problem zu beheben"
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Schwerer Fehler"
+
+#: include/functions.inc:475
 #, 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'."
+msgstr ""
+"FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Authentifizierungsfehler"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
-msgstr "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
+msgstr ""
+"Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie Ihren Administrator!"
+msgstr ""
+"Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
+"Ihren Administrator!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht passieren - räume mehrere Referenzen auf."
+msgstr ""
+"Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
+"passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, 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:1123
+#: include/functions.inc:877
 #, 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"
+msgstr ""
+"Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
+"Meldung bei Ãœberschreitung wieder an"
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Einträge pro Seite"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Filter anwenden"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Datei '%s' konnte nicht gelöscht werden. Versuchen Sie fusiondirectory-setup --check-directories um die Rechte zu beheben."
+msgstr ""
+"Datei '%s' konnte nicht gelöscht werden. Versuchen Sie fusiondirectory-setup"
+" --check-directories um die Rechte zu beheben."
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Kann nicht von Revisionsdatei lesen!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' ist nicht verfügbar. Benutze Standardbasis!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
+msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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!"
+msgstr ""
+"Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung"
+" möglich!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Konnte keine freie ID allozieren:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "unbekannte idAllocation-Methode!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool ist nicht eindeutig!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "keine ID verfügbar!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "maximale Anzahl von Versuchen abgelaufen!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Konnte keine freie ID allozieren!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
+msgstr ""
+"Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu"
+" beseitigen"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Keine Objekte dieser Kategorie"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 
@@ -1290,46 +1234,48 @@ msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Die Zeitzoneneinstellung \"%s\" in Ihrer Konfiguration ist nicht gültig."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den Administrator."
+msgstr ""
+"Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
+"Administrator."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable '%s' ist nicht gesetzt."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "Die Snapshot-Funktionalität ist aktiviert, aber das erforderliche Modul ist nicht verfügbar. Bitte installieren Sie '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Alle Kategorien"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mein Konto"
 
@@ -1352,7 +1298,7 @@ msgstr "Auswählen um Objekte des Typs '%s' aufzulisten"
 msgid "Select to search within subtrees"
 msgstr "Wählen Sie diese Option um auch in Teilbäumen zu suchen"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Suche in Teilbäumen"
 
@@ -1494,7 +1440,8 @@ msgstr "Das Feld '%s' enthält ein reserviertes Schlüsselwort!"
 #: include/class_msgPool.inc:297
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr "Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
+msgstr ""
+"Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
 
 #: include/class_msgPool.inc:313
 #, php-format
@@ -1544,7 +1491,7 @@ msgstr "Der Wert für '%s' ist zu groß!"
 #: include/class_msgPool.inc:364
 #, php-format
 msgid "'%s' must be smaller than %s!"
-msgstr "'%s' muss kleiner sein als %s!"
+msgstr "'%s' muß kleiner sein als %s!"
 
 #: include/class_msgPool.inc:378
 #, php-format
@@ -1554,7 +1501,7 @@ msgstr "Der Wert für '%s' ist zu kein!"
 #: include/class_msgPool.inc:380
 #, php-format
 msgid "'%s' must be %d or above!"
-msgstr "'%s' muss größer oder gleich %d sein!"
+msgstr "'%s' muß größer oder gleich %d sein!"
 
 #: include/class_msgPool.inc:393
 #, php-format
@@ -1601,8 +1548,7 @@ msgid "Missing %s PHP extension!"
 msgstr "Fehlenden %s PHP-Erweiterung!"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1556,7 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Anwenden"
@@ -1666,258 +1612,274 @@ msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch einen Klick auf die untere Schaltfläche deaktivieren."
+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
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, müssen Sie zunächst die %s Einstellungen entfernen!"
+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
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch einen Klick auf die Schaltfläche aktivieren."
+msgstr ""
+"Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch "
+"einen Klick auf die Schaltfläche aktivieren."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
+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
+#, 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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "%s Einstellungen hinzufügen"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "%s Einstellungen entfernen"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Januar"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Februar"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "März"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "August"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Dezember"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Montag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Freitag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Samstag"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Datenbankoperation fehlgeschlagen!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "Lese-Operation"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "Hinzufügeoperation"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "Änderungs-Operation"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "Lösch-Operation"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "Such-Operation"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "Authentifizierung"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s fehlgeschlagen!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "LDAP-Operation fehlgeschlagen"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objekt"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Ãœbertragung fehlgeschlagen!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ãœbertragung fehlgeschlagen: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Dieses '%s' ist noch in Benutzung."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte prüfen Sie Ihre Konfigurationsdatei!"
+msgstr ""
+"Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte "
+"prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kann Datei '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht anlegen!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Prüfe auf %s-Unterstützung"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installieren und aktivieren des %s Pear Moduls."
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Kann Klasse '%s' nicht initialisieren. Vielleicht fehlt ein Plugin in Ihrer FusionDirectory Installation?"
+msgstr ""
+"Kann Klasse '%s' nicht initialisieren. Vielleicht fehlt ein Plugin in Ihrer "
+"FusionDirectory Installation?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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!"
+msgstr ""
+"Die angegebene Basis ist ungültig. Der alte Wert wurde wieder hergestellt!"
 
 #: include/class_SnapshotDialogs.inc:30
 msgid "Creating an object snapshot"
@@ -1956,7 +1918,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Schnappschüsse"
 
@@ -2006,7 +1967,9 @@ msgstr "Argumente"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser Seite!"
+msgstr ""
+"Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
+"Seite!"
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
@@ -2018,83 +1981,91 @@ msgstr "Fehlerbericht senden"
 
 #: include/php_setup.inc:242
 msgid "Toggle information"
-msgstr "Informationen umschalten"
+msgstr "Zeige/Verstecke Informationen"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Leistungswarnung"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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!"
+msgstr ""
+"Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f "
+"Sekunden!"
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +2073,12 @@ msgstr "Name"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Beschreibung"
@@ -2119,11 +2089,13 @@ msgid "POSIX group %s"
 msgstr "POSIX-Gruppe %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Rolle %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Gruppe %s"
@@ -2160,8 +2132,8 @@ msgstr "Bearbeiten"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2142,154 @@ msgstr "Bearbeiten"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "Es wurde keine Plugin-Definition gefunden um '%s' zu Initialisieren. Bitte prüfen Sie Ihre Konfigurationsdatei!"
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "Sekunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "Minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "Stunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "Tage"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Aus Vorlage"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "%s Vorlage"
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
-msgstr "%s anzeigen"
+msgstr "Zeigen %s"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Filter Fehler"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Der Filter ist unvollständig!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Berechtigungsfehler"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "KEIN LABEL"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr "Vorlageneinstellungen"
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Dies ist der Name der Vorlage"
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Fehler beim Speichern"
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Der Eintrag %s existiert nicht"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Tab \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Unbekanntes Feld \"%s\""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2329,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d Bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -2343,7 +2339,7 @@ msgstr "Hochladen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,34 +2390,17 @@ msgstr "Ein Float größer als %f"
 msgid "A float smaller than %f"
 msgstr "Ein Float kleiner als %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Tab \"%s\""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
 #: include/class_acl.inc:36
 msgid "Manage access control lists"
-msgstr "Zugriffssteuerungsrollen verwalten"
+msgstr "Zugriffskontrolllisten verwalten"
 
 #: include/class_acl.inc:39
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:34
@@ -2445,14 +2424,20 @@ msgstr "Unbekannter Eintrag '%s'!"
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Filter anwenden"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Auf das als Kompilierverzeichnis angegegebene Verzeichnis '%s' kann nicht zugegriffen werden!"
+msgstr ""
+"Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
+"zugegriffen werden!"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2470,7 +2455,9 @@ msgstr ""
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Bitte starten Sie fusiondirectory-setup --check-config um dies zu beheben."
+msgstr ""
+"FusionDirectory Konfiguration %s/%s ist nicht lesbar. Bitte starten Sie "
+"fusiondirectory-setup --check-config um dies zu beheben."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2518,40 +2505,37 @@ 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:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
+msgstr ""
+"Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies "
+"und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2589,15 +2573,18 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
+msgstr ""
+"Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gültig"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
-msgstr "Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht verschickt"
+msgstr ""
+"Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht "
+"verschickt"
 
 #: html/main.php:115
 msgid "PHP configuration"
@@ -2607,11 +2594,13 @@ msgstr "PHP-Konfiguration"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Schwerer Fehler: Register globals ist aktiviert. FusionDirectory wird Logins verweigern sollte dies nicht von einem Administrator behoben werden."
+msgstr ""
+"Schwerer Fehler: Register globals ist aktiviert. FusionDirectory wird Logins"
+" verweigern sollte dies nicht von einem Administrator behoben werden."
 
 #: html/main.php:142
 msgid "Password change"
-msgstr "Passwortänderung"
+msgstr "Passwort-Änderung"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
@@ -2638,7 +2627,9 @@ msgstr "Erweiterung"
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
-msgstr "Schwerer Fehler: Kann keine Plugin-Definitionen für Plugin '%s' finden ('%s' ist keine Datei)!"
+msgstr ""
+"Schwerer Fehler: Kann keine Plugin-Definitionen für Plugin '%s' finden ('%s'"
+" ist keine Datei)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
@@ -2649,7 +2640,9 @@ msgstr "Konfigurationsfehler"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "FATAL: es wurden nicht alle POST-Variablen von PHP übertragen - bitte informieren Sie den Administrator!"
+msgstr ""
+"FATAL: es wurden nicht alle POST-Variablen von PHP übertragen - bitte "
+"informieren Sie den Administrator!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2662,225 +2655,8 @@ msgstr "Willkommen %s!"
 msgid "References"
 msgstr "Referenzen"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Benutzer POSIX-Einstellungen bearbeiten"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Basisverzeichnis"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Der Pfad zum Heimatverzeichnis für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Welche Shell soll verwendet werden, wenn dieser Benutzer sich einloggt"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Primäre Gruppe"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Primäre Gruppe für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Status dieses Benutzer unixkontos"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Benutzer-/Gruppenkennung erzwingen"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Benutzerkennungs- und Gruppenkennungswerte für diesen Benutzer erzwingen"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "Benutzerkennung"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Benutzerkennwert für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "Gruppenkennung"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Gruppenkennwert für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Gruppenmitgliedschaft"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Benutzer muss beim ersten Anmelden sein Passwort ändern"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "Benutzer muss das Passwort bei der ersten Anmeldung ändern (benötigt einen Wert für die Verzögerung, bevor die Passwortänderung erzwungen wird)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr "Mindestverzögerung zwischen Passwortänderungen (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr "Der Benutzer kann sein Passwort nicht vor dieser Anzahl an Tagen ändern (zum Deaktivieren leer lassen)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Verzögerung bevor die Passwortänderung erzwungen wird (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "Der Benutzer wird gezwungen werden, sein Passwort nach dieser Anzahl von Tagen zu ändern (Leer lassen zum Deaktivieren)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Passwort Ablaufdatum"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Datum nach dem dieses Benutzerpasswort ablaufen wird (leer lassen zur Deaktivierung)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Verzögerung von Inaktivität bevor der Benutzer deaktiviert wird (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Maximale Verzögerung der Inaktivität nach Passwortablauf bevor der Benutzer deaktiviert wird (leer lassen zum Deaktivieren)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Verzögerung für Benutzerwarnung vor Passwortablauf (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "Der Benutzer wird diese Anzahl an Tagen vorher gewarnt, bevor sein Passwort aufläuft (leer lassen zum Deaktivieren)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "System-Vertrauen"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Vertrauens-Modus"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Art der Authorisierung für diese Hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "deaktiviert"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "Vollzugriff"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "Zugriff auf diese Hosts erlauben"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Nur diesem Benutzer erlauben, dieser Liste von Hosts zu verbinden"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automatisch"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "abgelaufen"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Nachfrist aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "Passwort abgelaufen"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "Passwort kann nicht geändert werden"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Wartezeit für Sperre abgelaufen. Ignoriere Sperre!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Gruppe des Benutzers %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Gruppen und Rollen"
 
@@ -2900,14 +2676,14 @@ msgstr "Rollenmitgliedschaft"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password method"
-msgstr "Passwortmethode"
+msgstr "Passwort-Methode"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password hash method to use"
 msgstr "Zu verwendende Passworthash-Methode"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,280 +2704,297 @@ msgstr "Passwort Wiederholung"
 msgid "Same password as above, to avoid errors"
 msgstr "Gleiches Passwort wie oben, um Fehler zu vermeiden"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Benutzer"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Benutzerkontoinformation"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Benutzerkonto"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Nachname von diesem Benutzer"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Vorname von diesem Benutzer"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Kurze Beschreibung des Benutzers"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Bild"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Der Avatar für diesen Benutzer"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Geschäftliche Adresse"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Geschäftliche Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Geschäftliche Mobiltelefonnummer"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Geschäftliche Faxnummer"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Kontoinformation"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Passwort des Benutzers"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Persönliche Kontaktinformation"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Anzeigename"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Verwalter"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Postleitzahl"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Passwörter ist im Verlauf alter Passwörter"
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "Bestehender Wert das Passworts wurde nicht geändert"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
-msgstr "Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
+msgstr ""
+"Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:28
 msgid "Statistics about users"
@@ -3253,7 +3046,7 @@ msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:28
 msgid "Password recovery"
-msgstr "Passwortwiederherstellung"
+msgstr "Passwort-Wiederherstellung"
 
 #: plugins/config/class_recoveryConfig.inc:29
 msgid "Settings for the password recovery feature"
@@ -3265,7 +3058,7 @@ msgstr "Passwortwiederherstellungseinstellungen"
 
 #: plugins/config/class_recoveryConfig.inc:45
 msgid "Activate password recovery"
-msgstr "Passwortwiederherstellung aktivieren"
+msgstr "Aktivieren der Passwort-Wiederherstellung"
 
 #: plugins/config/class_recoveryConfig.inc:46
 msgid "Whether to activate or not password recovery feature"
@@ -3295,7 +3088,9 @@ msgstr "Salt für Tokens"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Nur eine Sicherheitsmaßnahme, Sie können egal was hier hineinschreiben, selbst zufällige Buchstaben"
+msgstr ""
+"Nur eine Sicherheitsmaßnahme, Sie können egal was hier hineinschreiben, "
+"selbst zufällige Buchstaben"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3305,10 +3100,12 @@ msgstr "Erlaube die Nutzung von alternativen Adressen"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Benutzer werden auch in der Lage sein, eine ihrer alternativen Adressen zur Wiederherstellung ihres Passworts, einzugeben"
+msgstr ""
+"Benutzer werden auch in der Lage sein, eine ihrer alternativen Adressen zur "
+"Wiederherstellung ihres Passworts, einzugeben"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Anmeldeattribut"
 
@@ -3344,7 +3141,10 @@ msgstr "Body (zuerst %s ist Login, zweiter ist Link)"
 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 der ersten Email, die verschickt wird wenn der Benutzer nach einem neuen Passwort fragt. Benutzen Sie %s für den Login und den Wiederherstellungslink."
+msgstr ""
+"Body der ersten Email, die verschickt wird wenn der Benutzer nach einem "
+"neuen Passwort fragt. Benutzen Sie %s für den Login und den "
+"Wiederherstellungslink."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3368,7 +3168,7 @@ msgstr "Betreff der zweiten Email"
 
 #: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
-msgstr "[FusionDirectory] Passwortwiederherstellung erfolgreich"
+msgstr "[FusionDirectory] Passwort-Wiederherstellung erfolgreich"
 
 #: plugins/config/class_recoveryConfig.inc:114
 #, php-format
@@ -3380,7 +3180,9 @@ msgstr "Body (%s ist Login)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Body der zweiten Email, die verschickt wird um zu bestätigen, dass das Passwort geändert wurde. Benutzen Sie %s für den Benutzerlogin."
+msgstr ""
+"Body der zweiten Email, die verschickt wird um zu bestätigen, dass das "
+"Passwort geändert wurde. Benutzen Sie %s für den Benutzerlogin."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3389,7 +3191,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Hallo,\n\nIhr Passwort wurde geändert.\nIhr Login ist immer noch %s."
+msgstr ""
+"Hallo,\n"
+"\n"
+"Ihr Passwort wurde geändert.\n"
+"Ihr Login ist immer noch %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3417,7 +3223,10 @@ msgstr "Sprache"
 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 "Sprache der Anwendung. Wenn 'automatisch' gesetzt wurde oder nicht verfügbar, wird die vom Browser nachgefragte verwendet. Diese Einstellung kann pro Nutzer überschrieben werden."
+msgstr ""
+"Sprache der Anwendung. Wenn 'automatisch' gesetzt wurde oder nicht "
+"verfügbar, wird die vom Browser nachgefragte verwendet. Diese Einstellung "
+"kann pro Nutzer überschrieben werden."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3436,526 +3245,483 @@ msgid "Timezone to be used"
 msgstr "Zu verwendende Zeitzone"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Schemaeinrichtung"
+msgid "Core settings"
+msgstr "Kerneinstellungen"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "LDAP Größenlimit"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Definiert die Anzahl der Einträge, die standardmäßig von LDAP geholt werden "
+"sollen."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Locking bearbeiten"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Prüfen ob ein Eintrag, der momentan bearbeitet wird, außerhalb von "
+"FusionDirectory zwischenzeitlich bearbeitet wurde."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Logging aktivieren"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Ereignisloggins auf Seiten von FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Aktiviert Schema-Überprüfung während des Logins."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Snapshots ermöglichen"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Dies ermöglicht es Ihnen, gewisse Stati von Einträgen zu speichern und diese"
+" später wieder herzustellen."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Basis für Snapshots"
+
+#: plugins/config/class_configInLdap.inc:141
+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
 msgid "Password settings"
-msgstr "Passworteinstellungen"
+msgstr "Passwort-Einstellungen"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Stadard Passworthash"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Standard hash, der verwendet werden soll"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
-msgstr "Standardhash erzwingen"
+msgstr "Standardhash forcieren"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
-msgstr "Verwendung des Standard-Passworthashs erzwingen"
+msgstr "Forciert die Nutzung des Standard Passworthashs"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Minimale Passwortlänge"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Minimale Länge der Benutzerpasswörter"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Passwort Minimallänge unterscheidet sich"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Mindestanzahl der unterschiedlichen Buchstaben vom letzten Passwort"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Verwende ablaufende Konten"
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
-msgstr "Aktiviert shadow Attributtests während der Anmeldung in FusionDirectory und erzwingt eine Passworterneuerung oder Kontensperrung"
-
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
-msgstr "SASL Realm"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr "SASL Exop"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr "Attribut welchen im userPasswort Attribut gespeichert werden soll"
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Kerneinstellungen"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Zusammenfassung in Listen anzeigen"
-
-#: plugins/config/class_configInLdap.inc:162
-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 "Bestimmt, ob eine Statusanzeige am Rande der Listen gezeigt werden soll, die eine kurze Zusammenfassung von Typ und Anzahl der Elemente in der Liste zeigt."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Locking bearbeiten"
-
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Prüfen ob ein Eintrag, der momentan bearbeitet wird, außerhalb von FusionDirectory zwischenzeitlich bearbeitet wurde."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Logging aktivieren"
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+"Aktiviert shadow Attributtests während des Logins in FusionDirectory und "
+"forciert Passworterneuerung und oder Kontensperrung"
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Ereignisloggins auf Seiten von FusionDirectory."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
+msgstr "SASL Realm"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "LDAP Größenlimit"
+msgid "SASL Exop"
+msgstr "SASL Exop"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Definiert die Anzahl der Einträge, die standardmäßig von LDAP geholt werden sollen."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr "Attribut welchen im userPasswort Attribut gespeichert werden soll"
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Anmeldung und Sitzung"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 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."
+msgstr ""
+"Welches LDAP Attribut soll als Loginname während des Logins verwendet "
+"werden."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Erzwinge verschlüsselte Verbindungen"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Aktiviert PHP-Sicherheitsprüfungen zur Erzwingung des verschlüsselten Zugangs (https) zur Webschnittstelle."
+msgstr ""
+"Aktiviert PHP-Sicherheitschecks zur Forcierung des verschlüsselten Zugangs "
+"(https) zur Webschnittstelle."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Bei unverschlüsselten Verbindungen warnen"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 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."
+msgstr ""
+"Zeigt dem Benutzer eine Warnung  wenn http anstelle von https verwendet "
+"wird."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Lebensdauer der Sitzung"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr "Kopfdatenname"
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Snapshots ermöglichen"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Dies ermöglicht es Ihnen, gewisse Stati von Einträgen zu speichern und diese später wieder herzustellen."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Basis für Snapshots"
-
-#: plugins/config/class_configInLdap.inc:237
-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:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Schlüsselpfad"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Zertifikatspfad"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "CA-Zertifikatspfad"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "System"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
-msgstr "Port"
+msgstr "Anschluss"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Ablage für Personen und Gruppen"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "DN-Attribut für Personen"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Zu verwendendes Attribut zu Beginn des Benutzers dn"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "CN-Muster"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Strikte Namenspolicy"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Nachster id hook"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Basisnummer für Benutzerkennung"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Wo mit der Suche nach einer neuen freien user id gestartet werden soll."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Basisnummer für Gruppenkennung"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Wo nach der Suche nach einer neuen freien group-ID geschaut werden soll."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Users RDN"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Groups RDN"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Der Zweig in welchem Gruppen gespeichert werden."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Id-Zuweisungsmethode"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Traditionell"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Fehler anzeigen"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "Zeigt PHP-Fehler in dem oberen Teil des Bildschirms. Dies sollte in produktiven Einrichtungen deaktiviert werden, da einige Passwörter enthalten sein könnten."
+msgstr ""
+"Zeigt PHP-Fehler in dem oberen Teil des Bildschirms. Dies sollte in "
+"produktiven Einrichtungen deaktiviert werden, da einige Passwörter enthalten"
+" sein könnten."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximale LDAP Abfragedauer"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Anhalten von LDAP-Aktionen wenn keine Antwort innerhalb der angegeben Anzahl von Sekunden erfolgt."
+msgstr ""
+"Anhalten von LDAP-Aktionen wenn keine Antwort innerhalb der angegeben Anzahl"
+" von Sekunden erfolgt."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Protokolliere LDAP-Statistiken"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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 "LDAP Timingstatistiken mit dem Syslog verfolgen. Dies kann helfen, Indexproblem oder schlechte Suchfilter zu finden."
+msgstr ""
+"LDAP Timingstatistiken mit dem Syslog verfolgen. Dies kann helfen, "
+"Indexproblem oder schlechte Suchfilter zu finden."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug Level"
 
-#: plugins/config/class_configInLdap.inc:403
+#: 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:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr "Hooks die aufgerufen werden wenn spezifische Aktionen passieren"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Zeige Zusammenfassung in Listen"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "Reiter"
+#: 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 ""
+"Bestimmt, ob eine Statusanzeige am Rande der Listen gezeigt werden soll, die"
+" eine kurze Zusammenfassung von Typ und Anzahl der Elemente in der Liste "
+"zeigt."
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
-msgstr "Der Tab, der diesen hook betrifft"
+#: 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:429
-msgid "mode"
-msgstr "mode"
+#: 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:429
-msgid "When to call this command"
-msgstr "Wann dieser Befehl aufgerufen wird"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
-msgstr "Der zu aufrufende Befehl"
+#: 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:442
-msgid "Hooks"
-msgstr "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Verfügbare Shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Verfügbare POSIX-Shells für FD-Benutzer."
+#: 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:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
+#: 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:466
-msgid "Show ACL tab on all objects"
-msgstr "ACL-Reiter auf allen Objekten anzeigen"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modus"
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
+msgstr "Wann dieser Befehl aufgerufen wird"
+
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr "Der zu aufrufende Befehl"
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3820,8 @@ msgstr "Abteilung"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3949,22 @@ msgstr "Benutzer verwalten"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Konto-Sperrung"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Konto aktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Konto deaktivieren"
 
@@ -4245,7 +4010,7 @@ msgstr "Benutzer entfernen"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +4030,7 @@ msgid "Information"
 msgstr "Information"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Name dieser Gruppe"
 
@@ -4290,128 +4054,149 @@ msgstr "Rollenmitglieder"
 msgid "Add users for the role"
 msgstr "Benutzer für die Rolle hinzufügen"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Gruppen und Rollen verwalten"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Rolleneigenschaften bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "POSIX-Eigenschaften bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Benutzergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Primäre Gruppen anzeigen"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Organisatorische Rollen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Anwendungsgruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Zeige primäre Gruppen"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
-msgstr "Mail-Gruppen anzeigen"
+msgstr "Zeige Mail Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
-msgstr "Samba-Gruppen anzeigen"
+msgstr "Zeige Samba Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr "DSA-Einträge anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Servergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Gruppen von Arbeitsstationen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Windows-Gruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Gruppen von Terminals anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Druckergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Telefongruppen anzeigen"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Unbekannter Typ: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objektgruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Objektgruppeninformation"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Kurze Beschreibung dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objektmitglied dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "System-Vertrauen"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Vertrauens-Modus"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Art der Authorisierung für diese Hosts"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "deaktiviert"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Vollzugriff"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "erlaube Zugriff auf diese Hosts"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 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:322
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4420,35 +4205,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Liste der Gruppen"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "POSIX-Gruppeninformation"
-
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "POSIX-Gruppe"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr "POSIX-Benutzergruppe"
-
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Erzwinge GID"
-
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "GID-Wert für diese Gruppe erzwingen"
-
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
-msgstr "GID-Wert für diese Gruppe"
-
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Gruppenmitglieder"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4496,10 +4252,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr "Zugriffssteuerungsrollen-Zuordnungsdialog"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modus"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4602,7 +4354,7 @@ msgstr "schreiben"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:344
 msgid "Show/hide advanced settings"
-msgstr "Erweiterte Einstellungen anzeigen/ausblenden"
+msgstr "Zeige/verstecke erweiterte Einstellungen"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:349
 msgid "Create objects"
@@ -4639,7 +4391,7 @@ msgstr "Enthält Einstellungen für diese Objekte: %s"
 
 #: plugins/admin/aclrole/class_aclRole.inc:78
 msgid "Access control roles"
-msgstr "Zugriffssteuerungsrollen"
+msgstr "Rollen für die Zugriffskontrolle"
 
 #: plugins/admin/aclrole/class_aclRole.inc:81
 msgid "ACL role"
@@ -4677,7 +4429,9 @@ msgstr "Erstellen eines neuen FusionDirectory Administratorkontos"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Dieser Dialog wird automatisch einen neuen Superadministrator in Ihren LDAP-Baum einfügen."
+msgstr ""
+"Dieser Dialog wird automatisch einen neuen Superadministrator in Ihren LDAP-"
+"Baum einfügen."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4692,7 +4446,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Dies scheint das erste Mal zu sein, dass Sie FusionDirectory starten - wir haben noch keine Konfiguration gefunden. Dieser einfache Assistent hilft Ihnen bei der Einrichtung."
+msgstr ""
+"Dies scheint das erste Mal zu sein, dass Sie FusionDirectory starten - wir "
+"haben noch keine Konfiguration gefunden. Dieser einfache Assistent hilft "
+"Ihnen bei der Einrichtung."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4708,7 +4465,9 @@ msgstr "Versucht, Probleme in Ihrer PHP- und LDAP-Umgebung zu ermitteln"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr "Lässt Sie aus einem Satz von einfachen bis erweiterten Konfigurationsschaltern wählen"
+msgstr ""
+"Lässt Sie aus einem Satz von einfachen bis erweiterten "
+"Konfigurationsschaltern wählen"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -4724,7 +4483,8 @@ msgstr "Finde jeden möglichen Konfigurationsfehler"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Migriere jede mögliche LDAP-Umgebung - erstellen Sie Sicherungsabzüge!"
+msgstr ""
+"Migriere jede mögliche LDAP-Umgebung - erstellen Sie Sicherungsabzüge!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4745,13 +4505,11 @@ msgstr "Klicken Sie auf die Schaltfläche 'Weiter' wenn Sie fertig sind."
 msgid "Add required object classes to the LDAP base"
 msgstr "Füge erforderliche Objekt-Klassen zum Basis-Objekt hinzu"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Aktuell"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Nach der Migration"
 
@@ -4759,50 +4517,57 @@ msgstr "Nach der Migration"
 msgid "Close"
 msgstr "Schliessen"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Während der LDAP-Inspektion, werden wir nach einigen häufigen Fallstricken "
+"prüfen, die bei der Migration zu FusionDirectory base LDAP Administration "
+"auftreten können. Sie möchten eventuell, die unten stehenden Probleme "
+"beheben, um reibungslose Dienste zu bieten."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Erneut prüfen"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Ausgewählte Einträge in diesen Baum verschieben"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Wenn Sie erfahren möchten, was bei der Migration der gewählten Einträge erfolgen wird, verwenden Sie den 'Zeige Änderungen'-Knopf um das LDIF zu sehen."
+msgstr ""
+"Wenn Sie erfahren möchten, was bei der Migration der gewählten Einträge "
+"erfolgen wird, verwenden Sie den 'Zeige Änderungen'-Knopf um das LDIF zu "
+"sehen."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
-msgstr "Änderungen anzeigen"
-
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Während der LDAP-Inspektion, werden wir nach einigen häufigen Fallstricken prüfen, die bei der Migration zu FusionDirectory base LDAP Administration auftreten können. Sie möchten eventuell, die unten stehenden Probleme beheben, um reibungslose Dienste zu bieten."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Erneut prüfen"
+msgstr "Zeige Änderungen"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
@@ -4842,7 +4607,10 @@ msgstr ""
 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 "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'."
+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
@@ -4857,7 +4625,7 @@ msgstr "Neues Passwort (Wiederholung)"
 
 #: ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
-msgstr "Passwortstärke"
+msgstr "Passwort-Stärke"
 
 #: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
 msgid "Change"
@@ -4879,7 +4647,9 @@ msgstr "Ihr Passwort wurde erfolgreich geändert."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Geben Sie Ihre aktuelle Email-Adresse ins unten genannte Feld ein und klicken Sie die 'Ändern'-Schaltfläche."
+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
 msgid ""
@@ -4895,7 +4665,9 @@ msgstr "Email"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "Passwortwiederherstellung ist nicht aktiviert. Wenn Sie Ihr Passwort verloren haben, kontaktieren Sie bitte Ihren Administrator"
+msgstr ""
+"Passwort-Wiederherstellung ist nicht aktiviert. Wenn Sie Ihr Passwort "
+"verloren haben, kontaktieren Sie bitte Ihren Administrator"
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4905,7 +4677,9 @@ msgstr "Anmeldefenster"
 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."
+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
@@ -4930,7 +4704,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der einfachste Weg, große Datenbanken ohne große Zeitüberschreitungen zu bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen sinnvollen Wert einzustellen."
+msgstr ""
+"Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller "
+"durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der "
+"einfachste Weg, große Datenbanken ohne große Zeitüberschreitungen zu "
+"bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen"
+" sinnvollen Wert einzustellen."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4938,13 +4717,16 @@ msgstr "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
+msgstr ""
+"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der Größenbeschränkung liegen"
+msgstr ""
+"Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der "
+"Größenbeschränkung liegen"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4959,12 +4741,16 @@ msgstr ""
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
+"'Abbrechen' zum Abbruch."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5035,17 +4821,26 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Einige Werte müssen einmalig im vollständigen Verzeichnis sein während einige Kombinationen keinen Sinn machen. FusionDirectory zeigt die relevanten Attribute. Bitte halten Sie die unten stehenden Werte bei um die Policies zu erfüllen."
+msgstr ""
+"Einige Werte müssen einmalig im vollständigen Verzeichnis sein während "
+"einige Kombinationen keinen Sinn machen. FusionDirectory zeigt die "
+"relevanten Attribute. Bitte halten Sie die unten stehenden Werte bei um die "
+"Policies zu erfüllen."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Beachten Sie, dass manche Einstellungen wie z.B. erstellte Snapshots nicht kopiert werden!"
+msgstr ""
+"Beachten Sie, dass manche Einstellungen wie z.B. erstellte Snapshots nicht "
+"kopiert werden!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Oder wenn Sie kopieren oder einen Eintrag ausschneiden und das Quellobjekt löschen, können Sie Fehler bekommen wenn dieses Objekt wieder eingefügt werden soll!"
+msgstr ""
+"Oder wenn Sie kopieren oder einen Eintrag ausschneiden und das Quellobjekt "
+"löschen, können Sie Fehler bekommen wenn dieses Objekt wieder eingefügt "
+"werden soll!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5085,11 +4880,11 @@ msgstr "Verfügbare Mitglieder"
 
 #: ihtml/themes/breezy/acl.tpl.c:26 ihtml/themes/breezy/acl.tpl.c:29
 msgid "List message possible targets"
-msgstr "Mögliche Empfänger dieser Nachricht anzeigen"
+msgstr "Zeige mögliche Empfänger dieser Nachricht"
 
 #: ihtml/themes/breezy/acl.tpl.c:35 ihtml/themes/breezy/acl.tpl.c:38
 msgid "List message recipients"
-msgstr "Nachrichtenempfänger anzeigen"
+msgstr "Zeige Nachrichtenempfänger"
 
 #: ihtml/themes/breezy/acl.tpl.c:44
 msgid "ACL for this object"
@@ -5147,13 +4942,15 @@ msgstr "Sie haben keine Berechtigung Ihr Passwort zu ändern"
 
 #: plugins/personal/generic/nochange.tpl.c:5
 msgid "Your password hash method will not be changed!"
-msgstr "Ihre Passwort-Hashmethode wird nicht geändert!"
+msgstr "Ihr Passwort-Hash wird nicht geändert!"
 
 #: plugins/personal/generic/changed.tpl.c:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle Programme anzupassen, die dieses Passwort auch benutzen."
+msgstr ""
+"Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle "
+"Programme anzupassen, die dieses Passwort auch benutzen."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
@@ -5164,8 +4961,8 @@ msgstr[1] "Es gibt %1 Gruppen:"
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] "Einer von diesen ist eine %1 Gruppe"
-msgstr[1] "%2 von %1 Gruppen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "There is no %1 group"
@@ -5181,8 +4978,8 @@ msgstr[1] "Es gibt %1 Benutzer:"
 #: plugins/addons/dashboard/users_stats.tpl.c:5
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-msgstr[0] "Einer von diesen hat ein %1 Konto"
-msgstr[1] "%2 von diesen haben ein %1 Konto"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "None of them have a %1 account"
@@ -5197,8 +4994,8 @@ msgstr[1] ""
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] "Einer von diesen ist gesperrt"
-msgstr[1] "%1 von diesen sind gesperrt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
@@ -5207,8 +5004,8 @@ msgstr "Keiner von diesen ist gesperrt"
 #: plugins/addons/dashboard/users_accounts.tpl.c:2
 msgid "There is one expired account"
 msgid_plural "There are %1 expired accounts"
-msgstr[0] "Es gibt ein abgelaufenes Konto"
-msgstr[1] "Es gibt %1 abgelaufene Konten"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:5
 msgid "There is no expired account"
@@ -5254,8 +5051,8 @@ msgstr "mail"
 #: plugins/addons/dashboard/users_accounts.tpl.c:35
 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] "Es gibt ein Konto, das in den nächsten %1 Tagen abläuft"
-msgstr[1] "Es gibt %2 Konten, die in den nächsten %1 Tagen ablaufen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:38
 msgid "There is no account expiring in the next %1 days"
@@ -5267,23 +5064,23 @@ msgstr "Nächste abgelaufene Konten"
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
-msgstr "Vorlagen anzeigen"
+msgstr "Zeige Vorlagen"
 
 #: plugins/admin/users/user-filter.tpl.c:8
 msgid "Show functional users"
-msgstr "Funktionale Benutzer anzeigen"
+msgstr "Zeige funktionale Benutzer"
 
 #: plugins/admin/users/user-filter.tpl.c:11
 msgid "Show POSIX users"
-msgstr "POSIX-Benutzer anzeigen"
+msgstr "Zeige POSIX Benutzer"
 
 #: plugins/admin/users/user-filter.tpl.c:14
 msgid "Show Mail users"
-msgstr "Mail-Benutzer anzeigen"
+msgstr "Zeige Mail Benutzer"
 
 #: plugins/admin/users/user-filter.tpl.c:17
 msgid "Show Samba users"
-msgstr "Samba-Benutzer anzeigen"
+msgstr "Zeige Samba Benutzer"
 
 #: plugins/admin/acl/remove.tpl.c:2
 msgid ""
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 32a5ba0071c823fe91bf9589a01f65fc82df4166..1f1d56056f7609e5b9a7a19527d52a562e058e4c 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -1,949 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Elissavet Botsaki <elisavet_b@hotmail.com>, 2015
-# Konstantinos Nikolou <kniko@kniko.net>, 2015
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Maria Nomikou <mnomikou@sch.gr>, 2015
-# MENTIS SPYROS <mentis.spyros@gmail.com>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Προτιμώμενη γλώσσα"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Βάση"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Προσπάθεια ξανά"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Παρακαλώ επαληθεύστε το όνομα χρήστη και τον κωδικό σας!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Μετακίνηση"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Έλεγχος έγκρισης για βάση δεδομένων  LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "'Έλεγχος για αόρατους χρήστες"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Έλεγχος για υπερδιαχειριστές "
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Έλεγχος για προεπιλεγμένους ρόλους και ομάδες στην ACL"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Έλεγχος για χρήστες εκτός της δομής δεδομένων "
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Έλεγχος για ομάδες εκτός της δομής δεδομένων"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Χρήστες"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Ρόλοι"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Δημιουργία"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Κατάσταση"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Προσπάθεια ξανά"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Ανανέωση"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Παρακαλώ επαληθεύστε το όνομα χρήστη και τον κωδικό σας!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
-msgstr "Εσωτερικό σφάλμα"
-
-#: include/class_logging.inc:80
-#, php-format
-msgid "Logging failed: %s"
-msgstr ""
-
-#: include/class_logging.inc:102
-#, php-format
-msgid "Invalid option \"%s\" specified!"
-msgstr ""
-
-#: include/class_logging.inc:106
-msgid "Specified objectType is empty or invalid!"
-msgstr ""
-
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "μη ρυθμισμένο"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Σφάλμα φίλτρου"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Το φίλτρο είναι μη ολοκληρωμένο!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Άδεια"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Σφάλμα άδειας"
+msgstr "Εσωτερικό σφάλμα"
 
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/class_logging.inc:81
 #, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για %s."
+msgid "Logging failed: %s"
+msgstr ""
 
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
+#: include/class_logging.inc:103
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για %s."
+msgid "Invalid option \"%s\" specified!"
+msgstr ""
 
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
+#: include/class_logging.inc:107
+msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Πάνω"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Κάτω"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
-msgstr "Ταξινόμηση πάνω"
+msgstr "Ταξινόμηση προς τα κάτω"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
-msgstr "Ταξινόμηση κάτω"
+msgstr "Ταξινόμηση προς τα πάνω"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "δημιουργήθηκε από"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Μετάβαση στον ριζικό τμήμα"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Μετάβαση ένα τμήμα επάνω"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Αρχή (Home)"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Επαναφόρτωση λίστας"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Αποκοπή αυτής της εγγραφής"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Αντιγραφή αυτής της εγγραφής"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Επαναφορά στιγμιοτύπων"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Εξαγωγή λίστας"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Επαναφορά στιγμιοτύπου"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Δημιουργία στιγμιότυπου"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Δημιουργία νέου στιγμιότυπου από αυτό το αντικείμενο"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Μοιραίο σφάλμα"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "σε"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "σε γραμμή"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Σφάλμα XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -955,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
@@ -986,356 +867,343 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Άδεια"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Ακύρωση όλων"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Αδυναμία επικόλλησης"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Πρότυπο"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Όνομα προτύπου"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Μοιραίο σφάλμα"
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr "ΣΦΑΛΜΑ: Σφάλμα σύνδεσης στον διακομιστή LDAP. Ο διακομιστής αποκρίθηκε '%s'."
+msgstr ""
+"ΣΦΑΛΜΑ: Σφάλμα σύνδεσης στον διακομιστή LDAP. Ο διακομιστής αποκρίθηκε '%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
-msgstr "Η σύνδεση (uid) δεν είναι μοναδική μέσα στο δέντρο LDAP. Παρακαλούμε επικοινωνήστε με τον διαχειριστή του συστήματος σας."
+msgstr ""
+"Η σύνδεση (uid) δεν είναι μοναδική μέσα στο δέντρο LDAP. Παρακαλούμε "
+"επικοινωνήστε με τον διαχειριστή του συστήματος σας."
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
-msgstr "Σφάλμα κατά την προσθήκη κλειδώματος. Επικοινωνήστε με τους προγραμματιστές!"
+msgstr ""
+"Σφάλμα κατά την προσθήκη κλειδώματος. Επικοινωνήστε με τους προγραμματιστές!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Αποτυχία δημιουργίας κλειδώματος στο δέντρο LDAP. Παρακαλούμε επικοινωνήστε με τον διαχειριστή του συστήματος σας."
+msgstr ""
+"Αποτυχία δημιουργίας κλειδώματος στο δέντρο LDAP. Παρακαλούμε επικοινωνήστε "
+"με τον διαχειριστή του συστήματος σας."
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Ο διακομιστής LDAP επίστρεψε: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Έχει ξεπεραστεί το όριο %d καταχωρίσεων!"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "ελλιπής"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Συνέχεια οπωσδήποτε"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Επεξεργασία οπωσδήποτε"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr "Καταχωρήσεις ανά σελίδα"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Εφαρμογή φίλτρου"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Αδύνατη η εγγραφή σε αρχείο αναθεώρησης!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Αδύνατη η ανάγνωση σε αρχείο αναθεώρησης!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Προειδοποίηση LDAP "
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr "Αδυναμία λήψης πληροφοριών σχήματος για τον εξυπηρετητή. Δεν υπάρχει η δυνατότητα ελέγχου σχήματος!"
+msgstr ""
+"Αδυναμία λήψης πληροφοριών σχήματος για τον εξυπηρετητή. Δεν υπάρχει η "
+"δυνατότητα ελέγχου σχήματος!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Δαθέσιμες κλάσεις"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Δεν είναι δυνατό να ανατεθεί μια free ID:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "αγνωστη μέθοδος idAllocation"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool  δεν είναι μοναδική!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "Μη διαθέσιμη ID!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "Υπέρβαση μεγίστου ορίου προσπαθειών!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Δεν είναι δυνατή η διάθεση μιας  free ID!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Αδύνατος ο εντοπισμός του αρχείου  '%s' - Παρακαλώ εκτελέστε την εντολή '%s' για να το διορθώσετε"
+msgstr ""
+"Αδυναμία εντοπισμού αρχείου '%s' - παρακαλώ εκτελέστε το '%s' για να το "
+"διορθώσετε"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
-msgstr "Παρακαλούμε διορθώστε το παραπάνω σφάλμα και φορτώστε την σελίδα ξανά."
+msgstr ""
+"Παρακαλούμε διορθώστε το παραπάνω σφάλμα και φορτώστε την σελίδα ξανά."
 
 #: include/class_timezone.inc:52
 #, php-format
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Αδυναμία bind σε LDAP. Επικοινωνήστε με τον διαχειριστή συστήματος"
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Όλες οι κατηγορίες"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Ο λογαριασμός μου"
 
@@ -1358,7 +1226,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1607,8 +1475,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1616,7 +1483,7 @@ msgid "Cancel"
 msgstr "Ακύρωση"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Εφαρμογή"
@@ -1688,239 +1555,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Μάρτιος"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Απρίλιος"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Μάιος"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Ιούνιος"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Ιούλιος"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Αύγουστος"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Αποτυχία βάσης δεδομένων!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "λειτουργία ανάγνωσης"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "λειτουργία προσθήκης"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "λειτουργία τροποποίησης"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "λειτουργία διαγραφής"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "λειτουργία αναζήτησης"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "πιστοποίηση"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s απέτυχε!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Η λειτουργία LDAP απέτυχε!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Η αποστολή απέτυχε!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Αποτυχία αποστολής: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Αποτυχία επικοινωνίας με την υπηρεσία υποδομής: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Το '%s'  χρησιμοποιείται ήδη."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Το αρχείο '%s' δεν υπάρχει!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Αδυναμία ανοίγματος αρχείου '%s' για ανάγνωση!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Αδυναμία ανοίογματος αρχείου `%s' για εγγραφή!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Αδύνατη η διαγραφή αρχείου '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Αδύνατη η δημιουργία του φακέλου '%s'!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Αδύνατη η διαγραφή του φακέλου '%s'"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Έλεγχος για υποστήριξη %s "
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1962,7 +1832,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Στιγμιότυπα"
 
@@ -2026,81 +1895,87 @@ msgstr "Αποστολή αναφοράς σφάλματος"
 msgid "Toggle information"
 msgstr "Εναλλαγή πληροφοριών"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Παρακαλώ επιλέξτε τις επιθυμητλες καταχωρήσεις"
+msgstr "Παρακαλώ επιλέξτε τις επιθυμητές εγγραφές"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2108,13 +1983,12 @@ msgstr "Όνομα"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Περιγραφή"
@@ -2125,11 +1999,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Ρόλος %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Ομάδα %s"
@@ -2166,8 +2042,8 @@ msgstr "Επεξεργασία"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2176,130 +2052,154 @@ msgstr "Επεξεργασία"
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "λεπτά"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "ώρες"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "ημέρες"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Από πρότυπο"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "πρότυπο %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Εμφάνιση %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Σφάλμα φίλτρου"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Το φίλτρο δεν είναι ολοκληρωμένο! "
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Σφάλμα δικαιωμάτων"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για  %s."
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για  %s."
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "ΧΩΡΙΣ ΕΤΙΚΕΤΑ"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr "Ρυθμίσεις προτύπου"
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Αυτό είναι το όνομα του προτύπου"
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr "Αδυναμία υπολογισμού dn: δεν υπάρχει γονική  tab class για \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Σφάλμα κατά την αποθήκευση"
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Υπάρχει ήδη μια καταχώριση με το ίδιο dn : %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Η καταχώριση  %s  δεν υπάρχει."
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Tab \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2339,8 +2239,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Αποστολή"
 
@@ -2349,7 +2249,7 @@ msgstr "Αποστολή"
 msgid "Download"
 msgstr "Λήψη"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2400,27 +2300,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Tab \"%s\""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2451,11 +2334,15 @@ msgstr ""
 msgid "All users"
 msgstr "Όλοι οι χρήστες"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Εφαρμογή φίλτρου"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2524,36 +2411,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr "Παρακαλώ ελέγξτε το συνδυασμό όνομα χρήστη/κωδικός πρόσβασης."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2562,7 +2444,8 @@ msgstr ""
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Οι ρυθμίσεις FusionDirectory %s/%s  δεν είναι αναγνώσιμες. Ακύρωση."
+msgstr ""
+"Οι ρυθμίσεις %s/%s  του FusionDirectory δεν είναι αναγνώσιμες. Εγκατάλειψη"
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2601,7 +2484,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2668,225 +2551,8 @@ msgstr "Καλώς ήλθατε στο %s!"
 msgid "References"
 msgstr "Αναφορές"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Επεξεργασία ρυθμίσεων χρηστών POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Προσωπικός κατάλογος"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Η διαδρομή για τον αρχικό κατάλογο του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Κέλυφος"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Ποιο κέλυφος πρέπει να χρησιμοποιηθεί όταν ο χρήστης συνδεθεί"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Κύρια ομάδα"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Κύρια ομάδα του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Κατάσταση του λογαριασμού unix του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Εξαναγκασμός user/group id"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Υποχρέωση συμπλήρωσης τιμών για user id και group id για αυτόν τον χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "User id"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Τιμή User id για αυτόν τον χρήστη."
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "Group id"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Τιμή Group id για αυτόν τον χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Μέλη ομάδας"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Λογαριασμός"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Ο χρήστης θα πρέπει να αλλάξει τον κωδικό πρόσβασης κατά την πρώτη του σύνδεση"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "Ο χρήστης πρέπει να αλλάξει συνθηματικό στην πρώτη σύνδεση (η τιμή στο πεδίο Καθυστέρηση δηλώνει το πόσες φορές μπορεί ο χρήστης να συνδεθεί πριν αναγκαστεί να αλλάξει συνθηματικό)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Καθυστέρηση πριν την υποχρεωτική αλλαγή κωδικού πρόσβασης (σε ημέρες)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "Ο χρήστης θα υποχρεωθεί να αλλάξει τον κωδικό πρόσβασής του μετά από αυτό τον αριθμό ημερών (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Ημερομηνία λήξης κωδικού πρόσβασης"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Ημερομηνία μετά από την οποία θα λήγει ο κωδικός πρόσβασης (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Ημέρες αδράνειας πριν από την απενεργοποίηση του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Μέγιστος αριθμός ημερών αδράνειας μετά την λήξη του κωδικού πρόσβασης πριν την απενεργοποίηση του χρήστη (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Ημέρες μεταξύ προειδοποίησης χρήστη και λήξης κωδικού:"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "Ο χρήστης θα προειδοποιείται αυτόν τον αριθμό των ημερών πριν από τη λήξη του κωδικού πρόσβασής του (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Επιστοσύνη συστήματος"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Λειτουργία επιστοσύνης"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Τύπος εξουσιοδότησης για αυτά τα συστήματα"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "απενεργοποιημένο"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "πλήρης πρόσβαση"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "να επιτραπεί η πρόσβαση σε αυτά τα host"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Επιτρέπεται σ'αυτόν τον χρήστη να συνδέεται στην ακόλουθη λίστα διακομιστών"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "αυτόματο"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr " έληξε"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "χρονικό διάστημα χάριτος ενεργό"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "ενεργό"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "ο κωδικός πρόσβασης έχει λήξει"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "ο κωδικός πρόσβασης δεν μπορεί να αλλάξει"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Υπέρβαση χρόνου κατά την αναμονή για κλέιδωμα. Αγνόηση κλειδώματος!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Ομάδα του χρήστη %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Ομάδες και ρόλοι"
 
@@ -2913,14 +2579,14 @@ msgid "Password hash method to use"
 msgstr "Μέθοδος hash για χρήση κωδικού"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
 #: plugins/personal/generic/paste_generic.tpl.c:14
 msgid "Password"
-msgstr "Κωδικός πρόσβασης"
+msgstr "Κωδικός πρόσβασης:"
 
 #: plugins/personal/generic/class_user.inc:51
 msgid "Password (Leave empty if you do not wish to change it)"
@@ -2934,278 +2600,300 @@ msgstr "Κωδικός ξανά"
 msgid "Same password as above, to avoid errors"
 msgstr "Ίδιος Κωδικός Πρόσβασης με τον προηγούμενο, για αποφυγή λαθών."
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Χρήστης"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Πληροφορίες λογαριασμού χρήστη"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Λογαριασμός χρήστη"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Επίθετο"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Το επίθετο του χρήστη."
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Όνομα"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Το όνομα του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Σύντομη περιγραφή του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Εικόνα"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Το άβαταρ του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Πληροφοριών επαφή οργανισμού"
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Πολιτεία"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Ταχυδρομική διεύθυνση εταιρίας"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Αρ. δωματίου"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Αριθμός δωματίου"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Αριθμός τηλεφώνου εργασίας"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Αριθμός κινητού τηλεφώνου εργασίας"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Αριθμός βομβητή εργασίας"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Φαξ"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Αριθμός φαξ εργασίας"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Ιστοσελίδα"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Προσωπική ιστοσελίδα"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Πληροφορίες λογαριασμού"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Λογαριασμός σύνδεσης αυτού του χρήστη."
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Ο κωδικός του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Προσωπικές πληροφορίες επαφής"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Όνομα που εμφανίζεται"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
-msgstr "Το όνομα με το οποίο πρέπει να εμφανίζεται ο χρήστης. Χρησιμοποιείται από το Exchange."
+msgstr ""
+"Το όνομα με το οποίο πρέπει να εμφανίζεται ο χρήστης. Χρησιμοποιείται από το"
+" Exchange."
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Διεύθυνση οικίας"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Ταχυδρομική διεύθυνση οικίας"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Ιδιωτικό τηλέφωνο"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
-msgstr "Τηλέφωνο οικίας"
+msgstr "Αριθμός τηλεφώνου οικίας"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Πληροφορίες οργανισμού"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Τίτλος"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
-msgstr "Τίτλος προσώπου στο οργανωτικό του πλαίσιο. Κάθε τίτλος είναι μια από τις πολλές τιμές αυτού του χαρακτηριστικού"
+msgstr ""
+"Τίτλος προσώπου στο οργανωτικό του πλαίσιο. Κάθε τίτλος είναι μια από τις "
+"πολλές τιμές αυτού του χαρακτηριστικού"
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Τμήμα"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Αρ. τμήματος"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Αριθμός τμήματος"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Αρ. Υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Αριθμός Υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Τύπος υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Διαχειριστής"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Ταχυδρομικός κώδικας"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Δεν έχετε δικαίωμα αλλαγής του κωδικού σας"
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Θα πρέπει να περιμένετε %d δευτερόλεπτα για να αλλάξετε το κωδικό σας"
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Ο κωδικός είναι στο ιστορικό παλιών κωδικών πρόσβασης."
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "Ο κωδικός πρόσβασής σας δεν έχει αλλάξει από την τρέχουσα τιμή"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Θα πρέπει να εισάγετε τον κύριο κωδικό σας για να συνεχίσετε"
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
-msgstr "Οι κωδικοί εισάγατε ως \"Νέο κωδικό\" και \"Επανάληψη νέου κωδικού\" δεν ταιριάζουν."
+msgstr ""
+"Οι κωδικοί εισάγατε ως \"Νέο κωδικό\" και \"Επανάληψη νέου κωδικού\" δεν "
+"ταιριάζουν."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Νέος κωδικός "
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Ο παλιός και ο νέος κωδικός πρόσβασης μοιάζουν πολύ"
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "Ο κωδικός που εισάγατε είναι πολύ μικρός"
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Ο νέος κωδικός πρόσβασης περιέχει προβληματικούς χαρακτήρες Unicode!"
 
@@ -3301,7 +2989,9 @@ msgstr ""
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Ως μέτρο ασφαλείας, μπορείτε να βάλετε οτιδήποτε εκεί, ακόμα και τυχαίους χαρακτήρες"
+msgstr ""
+"Ως μέτρο ασφαλείας, μπορείτε να βάλετε οτιδήποτε εκεί, ακόμα και τυχαίους "
+"χαρακτήρες"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3311,10 +3001,12 @@ msgstr "Να επιτρέπεται η χρήση εναλλακτικών δι
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Οι χρήστες θα έχουν επίσης τη δυνατότητα να εισάγουν μία από τις εναλλακτικές τους διευθύνσεις για να ανακτήσουν τον κωδικό τους"
+msgstr ""
+"Οι χρήστες θα έχουν επίσης τη δυνατότητα να εισάγουν μία από τις "
+"εναλλακτικές τους διευθύνσεις για να ανακτήσουν τον κωδικό τους"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3395,7 +3087,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Γειά σας,\n\nΟ κωδικός σας άλλαξε.\nΗ υνδεση σας είναι ακόμα %s."
+msgstr ""
+"Γειά σας,\n"
+"\n"
+"Ο κωδικός σας άλλαξε.\n"
+"Η υνδεση σας είναι ακόμα %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3423,7 +3119,9 @@ msgstr "Γλώσσα"
 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 "Γλώσσα της εφαρμογής. Αν «αυτόματη» ή μη διαθέσιμη, θα χρησιμοποιηθεί η γλώσσα του browser. Αυτή η ρύθμιση μπορεί να παρακαμφθεί ανά χρήστη."
+msgstr ""
+"Γλώσσα της εφαρμογής. Αν «αυτόματη» ή μη διαθέσιμη, θα χρησιμοποιηθεί η "
+"γλώσσα του browser. Αυτή η ρύθμιση μπορεί να παρακαμφθεί ανά χρήστη."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3442,526 +3140,466 @@ msgid "Timezone to be used"
 msgstr "Ζώνη ώρας που θα χρησιμοποιηθεί"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Επεξεργασία κλειδώματος"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Ελέγξτε αν η εγγραφή που υφίσταται επεξεργασία έχει στο μεταξύ τροποποιηθεί "
+"έξω από FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Ενεργοποίηση λήψεων στιγμιότυπων"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Ρυθμίσεις κωδικού πρόσβασης"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Ελάχιστο μήκος κωδικού"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Ελάχιστο μήκος κωδικού χρήστη"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Ελάχιστη διαφοροποίηση κωδικού"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Ελάχιστος αριθμός διαφορετικών χαρακτήρων από τον τελευταίο κωδικό"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Χρήση λήξης λογαριασμού"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr "Επεξεργασία κλειδώματος"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Ελέγξτε αν η εγγραφή που υφίσταται επεξεργασία έχει στο μεταξύ τροποποιηθεί έξω από FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Επιβολή κρυπτογραφημένων συνδέσεων"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Προειδοποίηση αν η συνεδρία δεν είναι κρυπτογραφημένη"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
-msgstr "θα εμφανίσει προειδοποίηση προς το χρήστη όταν το πρωτόκολλο http χρησιμοποιείται αντί του πρωτοκόλλου https "
+msgstr ""
+"θα εμφανίσει προειδοποίηση προς το χρήστη όταν το πρωτόκολλο http "
+"χρησιμοποιείται αντί του πρωτοκόλλου https "
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Διάρκεια συνεδρίας"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Ενεργοποίηση λήψεων στιγμιότυπων"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
-msgstr "Σ'υστημα"
+msgstr "Όνομα συστήματος"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Θύρα"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Αυστηρή πολιτική ονοματοδοσίας"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Ενεργοποίηση αυστηρού ελέγχου στα ονόματα χρηστών και ομάδων"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr "Ένα σενάριο που θα κληθεί για την εύρεση του επόμενου ελεύθερου id για χρήστες ή ομάδες."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Αριθμός βάση για user id"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Τοποθεσία εύρεσης νέου ελεύθερου user id."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Αριθμός βάση για group id"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Τοποθεσία εύρεσης νέου ελεύθερου group id."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται χρήστες."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται ομάδες."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται ρόλοι ACL."
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Μέθοδος διανομής id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Μέθοδος για την διανομή user/group id"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Παραδοσιακή"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Αποσφαλμάτωση"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Προβολή σφαλμάτων"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Διάφορα"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "λειτουργία"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
-msgstr "Πότε καλείται αυτή η εντολή"
-
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: 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:435
-msgid "The command that will be called"
-msgstr "Η εντολή που θα κληθεί"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Hooks"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: 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:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Hooks"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Λειτουργία"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
+msgstr "Πότε καλείται αυτή η εντολή"
+
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr "Η εντολή που θα κληθεί"
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4060,9 +3698,8 @@ msgstr "τμήμα"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4190,22 +3827,24 @@ msgstr "Διαχείριση χρηστών"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Κλείδωμα λογαριασμού"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
-msgstr "Μέθοδος κωδικού πρόσβασης \"%s\" δεν υποστηρίζει κλείδωμα. Ο λογαριασμός \"%s\" δεν έχει κλειδώσει!"
+msgstr ""
+"Μέθοδος κωδικού πρόσβασης \"%s\" δεν υποστηρίζει κλείδωμα. Ο λογαριασμός "
+"\"%s\" δεν έχει κλειδώσει!"
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Ξεκλείδωμα λογαριασμού"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Κλείδωμα λογαριασμού"
 
@@ -4251,7 +3890,7 @@ msgstr "Αφαίρεση χρήστη"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4271,8 +3910,7 @@ msgid "Information"
 msgstr "Πληροφορίες"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Όνομα αυτής της ομάδας"
 
@@ -4296,164 +3934,158 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Προσθήκη χρηστών για το ρόλο"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Διαχείριση ομάδων και ρόλων"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Επεξεργασία ιδιοτήτων ρόλου"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Επεξεργασία ιδιοτήτων posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Εμφάνιση ομάδων χρήστη"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Εμφάνιση αρχικών ομάδων"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Λίστα ρόλων οργανισμών"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Εμφάνιση ομάδων εφαρμογών"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Εμφάνιση αρχικών ομάδων"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Εμφάνιση ομάδων αλληλογραφίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Εμφάνιση ομάδων samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Εμφάνιση ομάδων server"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Εμφάνιση ομάδων σταθμών εργασίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Εμφάνιση ομάδων windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Εμφάνιση ομάδων τερματικού"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Εμφάνιση ομάδων εκτυπωτή"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Εμφάνιση ομάδων τηλεφώνου"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "'Αγνωστος τύπος: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Ανύπαρκτο dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Ομάδα αντικειμένου"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Πληροφορίες ομάδας αντικειμένου"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Ομάδα"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Σύντομη περιγραφή αυτής της ομάδας"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Αντικείμενα μέλους"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Αντικείμενα μέλους για αυτή την ομάδα"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr "Επιτρέπεται σ'αυτή την ομάδα να συνδέεται στην ακόλουθη λίστα διακομιστών"
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr "Τοποθετηση σταθμών εργασίας και τερματικών στην ίδια ομάδα δεν επιτρέπεται"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Εμπιστοσύνη συστήματος"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Λίστα ομάδων"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Λειτουργία επιστοσύνης"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "Πληροφορίες ομάδας POSIX"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Τύπος εξουσιοδότησή για αυτά τα συστήματα"
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "Ομάδα POSIX"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "απενεργοποιημένο"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr "Ομάδα χρηστών POSIX"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Πλήρης Πρόσβαση"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Εξαναγκασμός GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "να επιτραπεί πρόσβαση σε αυτά τα host"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "Εξαναγκασμός τιμής GID για αυτή την ομάδα"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
+"Επιτρέπεται σ'αυτή την ομάδα να συνδέεται στην ακόλουθη λίστα διακομιστών"
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
-msgstr "Τιμή GID για αυτήν την ομάδα"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
+msgstr ""
+"Τοποθετηση σταθμών εργασίας και τερματικών στην ίδια ομάδα δεν επιτρέπεται"
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Μέλη ομάδας"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Λίστα ομάδων"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4502,10 +4134,6 @@ msgstr "Διάλογος Ανάθεσης ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Διάλογος λίστας ελέγχου ανάθεσης ρόλων"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Λειτουργία"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Αυτό εφαρμόζεται σε ολόκληρο το υποδένδρο ή μόνο στη βάση;"
@@ -4751,13 +4379,11 @@ msgstr "Πατήστε το κουμπί 'Επόμενο' για να τελει
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Τρέχουσα"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Ύστερα από την μετάβαση"
 
@@ -4765,51 +4391,54 @@ msgstr "Ύστερα από την μετάβαση"
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Επανάληψη ελέγχου"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Μετακίνηση επιλεγμένων εγγραφών σε αυτό το δέντρο"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Αν θέλετε να μάθετε τι θα γίνει όταν συγχωνεύονται οι επιλεγμένες καταχωρήσεις, χρησιμοποιήστε το κουμπί 'Εμφάνιση των αλλαγών' για να δείτε το LDIF."
+msgstr ""
+"Αν θέλετε να μάθετε τι θα γίνει όταν συγχωνεύονται οι επιλεγμένες "
+"καταχωρήσεις, χρησιμοποιήστε το κουμπί 'Εμφάνιση των αλλαγών' για να δείτε "
+"το LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Εμφάνιση αλλαγών"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Επανάληψη ελέγχου"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Δημιοτυγήστε το δικό σας αρχείο ρυθμίσεων"
@@ -4911,7 +4540,9 @@ msgstr "Οθόνη σύνδεσης"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr "Εισαγωγή ονόματος χρήστη και κωδικού πρόσβασης για σύνδεση στο σύστημα διαχείρισης σελίδας"
+msgstr ""
+"Εισαγωγή ονόματος χρήστη και κωδικού πρόσβασης για σύνδεση στο σύστημα "
+"διαχείρισης σελίδας"
 
 #: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
 #: ihtml/themes/breezy/login.tpl.c:14
@@ -4970,7 +4601,9 @@ msgstr ""
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/remove.tpl.c:8
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Αν είστε σίγουροι, πατήστε \"Διαγραφή\" για να συνεχίσετε ή \"Ακύρωση\" για να εγκαταλείψετε. "
+msgstr ""
+"Αν είστε σίγουροι, πατήστε \"Διαγραφή\" για να συνεχίσετε ή \"Ακύρωση\" για "
+"να εγκαταλείψετε. "
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index 72e3a415721269c151ae3bf1a612db3afe14964b..50248595cab5587ff7d3f9fdad853c8c15a746e4 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-03-26 17:52+0200\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -18,927 +18,813 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid ""
 "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid ""
 "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr ""
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -950,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -981,307 +867,283 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a href=\"recovery.php"
 "\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
-#, php-format
-msgid "Class(es) available"
-msgstr ""
-
-#: include/functions.inc:2636
-msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
+#: include/functions.inc:2085
 #, php-format
-msgid "%sPoolMin >= %sPoolMax!"
+msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+#: include/functions.inc:2103
+msgid ""
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,12 +1152,12 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
@@ -1303,34 +1165,34 @@ msgid ""
 "passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1353,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1602,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1611,7 +1472,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1681,239 +1542,242 @@ msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1955,7 +1819,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2019,82 +1882,88 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid ""
 "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on \"%2$s"
+"\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,11 +1987,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2030,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2040,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2334,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2344,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module \"imagick"
 "\" to be installed!"
@@ -2395,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on \"%2$s"
-"\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2447,11 +2324,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2520,36 +2401,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2598,7 +2474,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2665,225 +2541,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2910,7 +2569,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2931,278 +2590,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new password"
 "\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3311,7 +2986,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3415,548 +3090,481 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using "
-"a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a "
-"single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4055,9 +3663,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4185,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4246,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4266,8 +3873,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4291,163 +3897,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4497,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4746,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4760,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls "
+"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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface. "
 "If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 4c9458696a526913e6437be0e16cbfa5e758ae26..1686c4763096dfd4bee21320054f0000ab0742e3 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -1,943 +1,865 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Selección de idiomas"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permite seleccionar su idioma preferido"
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nombre de la localización"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de conexión"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Conexión TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN del administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Contraseña de administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Estado actual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuración LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Conectividad LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este dialogo realiza la configuración básica de la conectividad LDAP para "
+"FusionDirectory"
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "¡La conexión como usuario '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Reintento"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La conexión anónima al servidor '%s' ha tenido exito."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Refresco"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "¡Por Favor especifique un usuario y contraseña!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Error de configuración"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completado"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Siguiente"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Terminar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Terminar - Escribir el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Escribir archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"El fichero de configuración es universalmente legible. ¡Por favor modifique "
+"los permisos del archivo!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "En estos momentos la configuración no es accesible o no existe."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
+"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
+"mientras que otros usuarios no deben poder."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Comprobaciones de módulos y extensiones PHP"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Comprobación de la instalación"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Comprobación básica de la versión de PHP y las extensiones."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Comprobando la versión de PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP debe ser versión '%s' o superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor actualize a la versión soportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
+msgstr ""
+"FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory requiere este modulo para una interfaz internacionalizada."
+msgstr ""
+"FusionDirectory requiere este modulo para una interfaz internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory requiere este modulo para comunicarse con distintos tipos de servidores y protocolos."
+msgstr ""
+"FusionDirectory requiere este modulo para comunicarse con distintos tipos de"
+" servidores y protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory requiere este modulo para la integración con Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar encripción SSHA"
+msgstr ""
+"FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
+"encripción SSHA"
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
+msgstr ""
+"FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requiere este modulo para manejar cadenas unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "modulo de compresión"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requiere esta extensión para manejar capturas."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "registr_globals es un mecanismo de PHP para registrar todas las variables globales de tal manera que sean accesible desde scripts sin que cambien su ámbito. Esto puede ser un problema de seguridad."
+msgstr ""
+"registr_globals es un mecanismo de PHP para registrar todas las variables "
+"globales de tal manera que sean accesible desde scripts sin que cambien su "
+"ámbito. Esto puede ser un problema de seguridad."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Busque 'register_globals' en su php.ini y modifíquelo por 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP usa este valor en el recolector de basura para eliminar las sesiones antiguas."
+msgstr ""
+"PHP usa este valor en el recolector de basura para eliminar las sesiones "
+"antiguas."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Ajustando este valor a un día impedirá la perdida de sesiones y cookies antes de que realmente se desconecte por tiempo."
+msgstr ""
+"Ajustando este valor a un día impedirá la perdida de sesiones y cookies "
+"antes de que realmente se desconecte por tiempo."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
+msgstr ""
+"Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Off"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr "Busque 'session.auto_start' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Esta opción está relacionada con el manejo de salida de PHP. Desactive esta opción poniéndola en off para mejorar el rendimiento."
+msgstr ""
+"Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
+"opción poniéndola en off para mejorar el rendimiento."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Busque 'implicit_flush' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
+msgstr ""
+"Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Aumente la seguridad del servidor modificando el parámetro 'expose_php' a 'off'. PHP no debería enviar ningún tipo de información sobre el servidor que esta ejecutando la aplicación."
+msgstr ""
+"Aumente la seguridad del servidor modificando el parámetro 'expose_php' a "
+"'off'. PHP no debería enviar ningún tipo de información sobre el servidor "
+"que esta ejecutando la aplicación."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
+msgstr ""
+"Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenido al asistente de configuración de FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Mensaje de Bienvenida"
+msgstr ""
+"Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analizar el arbol LDAP actual por compatibilidad con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Analizando objetos en la entrada raíz"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Comprobando usuarios invisibles"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Comprobando súper administrador"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Comprobando cuentas fuera del árbol de usuarios"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Objeto '%s' de FusionDirectory faltante!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Por favor compruebe su instalación"
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "No se puede un tipo de objeto estructural en su entrada raíz. Por favor intente añadir la clase de objeto '%s' manualmente."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
+"intente añadir la clase de objeto '%s' manualmente."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Aviso"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están incompletos."
+msgstr ""
+"Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
+"incompletos."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crear"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Roles"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crear"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Error"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios al árbol de usuarios configurado"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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"
+msgstr ""
+"Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nombre de la localización"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de conexión"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Conexión TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN del administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Contraseña de administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Estado actual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuración LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Conectividad LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Este dialogo realiza la configuración básica de la conectividad LDAP para FusionDirectory"
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "¡La conexión como usuario '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Reintento"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La conexión anónima al servidor '%s' ha tenido exito."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Refresco"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "¡Por Favor especifique un usuario y contraseña!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Terminar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Terminar - Escribir el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Escribir archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "El fichero de configuración es universalmente legible. ¡Por favor modifique los permisos del archivo!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "En estos momentos la configuración no es accesible o no existe."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Después de descargar y colocar el archivo en %s, por favor asegúrese de que el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, mientras que otros usuarios no deben poder."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Error de configuración"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Completado"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenido al asistente de configuración de FusionDirectory"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Siguiente"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Mensaje de Bienvenida"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "error interno"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Entrada fallida: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡Se ha indicado un objectType vacio o no válido!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "Sin configurar"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Error del filtro"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "¡El filtro está incompleto!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Permisos"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "No tiene permisos para crear una instantanea para %s."
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "No tiene permisos para recuperar una instantanea para %s."
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Arriba"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Error"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "en"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "En linea"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Error XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +871,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error en la configuración"
@@ -978,310 +900,304 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
+msgstr ""
+"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Permisos"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Inicio"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Error fatal: no se han definido un emplazamiento para las clases - por favor ejecute '%s' para solucionar esto"
+msgstr ""
+"Error fatal: no se han definido un emplazamiento para las clases - por favor"
+" ejecute '%s' para solucionar esto"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo ejecutando '%s'"
+msgstr ""
+"Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
+"ejecutando '%s'"
+
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Error fatal"
 
-#: include/functions.inc:493
+#: include/functions.inc:475
 #, 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'."
+msgstr ""
+"FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
-msgstr "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los desarrolladores!"
+msgstr ""
+"Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
+"desarrolladores!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte con su Administrador!"
+msgstr ""
+"No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte"
+" con su Administrador!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no debería ocurrir - limpiando referencias multiples."
+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:1121
+#: include/functions.inc:875
 #, 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:1123
+#: include/functions.inc:877
 #, 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"
+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:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Entradas por página"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "No se puede leer el archivo de revisión!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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!"
+msgstr ""
+"No puedo obtener información de esquemas del servidor. ¡No es posible "
+"comprobar los esquemas!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "No se puede asignar un identificador (ID) libre:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "¡método de asignación de id desconocido!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "¡%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "¡sambaUnixIdPool no es único!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "¡No hay ID disponibles!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "¡Excedido el número de intentos máximo!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "¡No se puede asignar un identificador (ID) libre!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
+msgstr ""
+"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
+"solucionarlo"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Por favor solucione el problema y actualize la página."
 
@@ -1290,46 +1206,48 @@ msgstr "Por favor solucione el problema y actualize la página."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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."
+msgstr ""
+"No se puede conectar a LDAP: Por favor consulte con el administrador de "
+"sistemas."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no está activo."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "La funcionalidad de instancias esta activa, pero no se encuentra el módulo de compresión requerido. Por favor instale '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -1352,7 +1270,7 @@ msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de los subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
@@ -1494,7 +1412,8 @@ msgstr "¡El campo '%s' tiene una palabra reservada!"
 #: include/class_msgPool.inc:297
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr "¡El comando especificado como método %s para la extensión '%s' no existe!"
+msgstr ""
+"¡El comando especificado como método %s para la extensión '%s' no existe!"
 
 #: include/class_msgPool.inc:313
 #, php-format
@@ -1601,8 +1520,7 @@ msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1528,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
@@ -1666,255 +1584,270 @@ msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando aquí"
+msgstr ""
+"Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
+"aquí"
 
 #: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, necesita eliminar las caracteristicas %s primero!"
+msgstr ""
+"Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
+"necesita eliminar las caracteristicas %s primero!"
 
 #: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando aquí"
+msgstr ""
+"Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
+"aquí"
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, necesita añadir las caracteristicas %s primero!"
+msgstr ""
+"Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
+"necesita añadir las caracteristicas %s primero!"
+
+#: include/class_msgPool.inc:614
+#, 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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Operación de base de datos fallida!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, 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:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe el archivo de configuración!"
+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:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "No se puede inicializar la clase '%s'! Posiblemente hay un complemento faltante en su instalación de FusionDirectory?"
+msgstr ""
+"No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
+"faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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!"
@@ -1956,7 +1889,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2006,7 +1938,8 @@ msgstr "Argumentos"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "¡La generación de esta página ha provocado errores en el interprete PHP!"
+msgstr ""
+"¡La generación de esta página ha provocado errores en el interprete PHP!"
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
@@ -2020,81 +1953,87 @@ msgstr "Enviar informe de errores"
 msgid "Toggle information"
 msgstr "Modificar información"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +2041,12 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descripción"
@@ -2119,11 +2057,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2100,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2110,154 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "No hay definiciones de extensión para iniciar '%s', por favor compruebe su archivo de configuración."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "El proceso de eliminación ha sido cancelado por la extensión '%s': %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Error del filtro"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "¡El filtro está incompleto!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Error de permisos"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2297,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Enviar"
 
@@ -2343,7 +2307,7 @@ msgstr "Enviar"
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2358,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,11 +2392,15 @@ msgstr "¡Entrada desconocida '%s'!"
 msgid "All users"
 msgstr "Todos los usuarios"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
@@ -2518,45 +2469,44 @@ 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:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
-msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
+msgstr ""
+"Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y recargue esta página antes de iniciar sesión!"
+msgstr ""
+"Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y "
+"recargue esta página antes de iniciar sesión!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
+msgstr ""
+"La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2589,13 +2539,14 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
+msgstr ""
+"Contacte a su administrador, hubo un problema con el servidor de correo"
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2607,7 +2558,9 @@ msgstr "Configuración PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso hasta que esto sea solucionado por un administrador."
+msgstr ""
+"Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso"
+" hasta que esto sea solucionado por un administrador."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2615,7 +2568,8 @@ msgstr "Cambio de contraseña"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
+msgstr ""
+"Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2649,7 +2603,9 @@ msgstr "Error de configuración"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Error fatal: no todas las variables POST fueron transferidas por PHP - por favor informe a su administrador!"
+msgstr ""
+"Error fatal: no todas las variables POST fueron transferidas por PHP - por "
+"favor informe a su administrador!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2662,225 +2618,8 @@ msgstr "¡Bienvenido %s!"
 msgid "References"
 msgstr "Referencias"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Editar parametros de usuarios POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Directorio de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Pertenencia a grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Cuenta"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "El usuario debe introducir la contraseña en el primer inicio de sesión"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Sistema de seguridad"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Modo seguro"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "desactivado"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "Acceso sin restricciones"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "Permitir el acceso a estos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Periodo de gracia activado"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "la contraseña expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "no puede cambiar la contraseña"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2646,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2667,295 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Provincia"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Categoría profesional"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Gestor"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Código Postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
-msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
+msgstr ""
+"La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "La nueva contraseña es demasiado corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -3308,7 +3064,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Atributo de inicio de sesión"
 
@@ -3389,7 +3145,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Saludos,\n\nSu clave ha sido cambiada.\nSu nombre de usuario aun es %s."
+msgstr ""
+"Saludos,\n"
+"\n"
+"Su clave ha sido cambiada.\n"
+"Su nombre de usuario aun es %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3436,526 +3196,459 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
-msgstr "Parámetros de Contraseña"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
-msgstr "Longitud mínima de la contraseña"
-
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activar instantaneas"
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
-msgstr "Usar caducidad de cuenta"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base de instantaneas"
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+msgid "Password settings"
+msgstr "Parámetros de Contraseña"
+
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Mostrar resumen en listados"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
+msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:162
-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."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
+msgstr "Usar caducidad de cuenta"
+
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activar instantaneas"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base de instantaneas"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modo"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
-msgstr "Métodos"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Métodos"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3747,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3876,22 @@ msgstr "Gestión de usuarios"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
@@ -4245,7 +3937,7 @@ msgstr "Eliminar usuario"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3957,7 @@ msgid "Information"
 msgstr "Información"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +3981,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar características posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de seguridad"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo seguro"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desactivado"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acceso sin restricciones"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forzar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Miembros del grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4179,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4677,7 +4356,9 @@ msgstr "Crear una nueva cuenta administrador de FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol LDAP."
+msgstr ""
+"Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol "
+"LDAP."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4692,7 +4373,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos ninguna configuración hasta el momento. Este simple asistente trata de ayudarlo a configurar."
+msgstr ""
+"Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos "
+"ninguna configuración hasta el momento. Este simple asistente trata de "
+"ayudarlo a configurar."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4724,7 +4408,9 @@ msgstr "Encontrar cada posible error de configuración"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Migración asistidas de cualquier configuración LDAP - ¡creando copias de seguridad!"
+msgstr ""
+"Migración asistidas de cualquier configuración LDAP - ¡creando copias de "
+"seguridad!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4745,13 +4431,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr "Añadir las clases de objetos necesarias a la base LDAP"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Actual"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Despues de migrar"
 
@@ -4759,51 +4443,57 @@ msgstr "Despues de migrar"
 msgid "Close"
 msgstr "Cerrar"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Durante la inspección del LDAP vamos a verificar varios problemas comunes "
+"que pueden ocurrir durante la migración a administración por FusionDirectory"
+" de la base LDAP. Puede querer reparar los problemas debajo, para proveer un"
+" servicio mas eficiente."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Comprobar de nuevo"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Si quiere saber que se hará cuando se migren las entradas seleccionadas use el botón 'Mostrar cambios' para ver el LDIF."
+msgstr ""
+"Si quiere saber que se hará cuando se migren las entradas seleccionadas use "
+"el botón 'Mostrar cambios' para ver el LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Mostrar cambios"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Durante la inspección del LDAP vamos a verificar varios problemas comunes que pueden ocurrir durante la migración a administración por FusionDirectory de la base LDAP. Puede querer reparar los problemas debajo, para proveer un servicio mas eficiente."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Comprobar de nuevo"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Crear su fichero de configuración"
@@ -4842,7 +4532,9 @@ msgstr ""
 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 "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'."
+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
@@ -4879,7 +4571,9 @@ msgstr "Su contraseña se ha cambiado correctamente."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Introduzca su dirección de correo actual en el campo debajo y presione el botón 'Cambiar'"
+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
 msgid ""
@@ -4905,7 +4599,9 @@ msgstr "Pantalla de inicio"
 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."
+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
@@ -4930,7 +4626,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y protege al servidor LDAP de tener una mayor carga. La manera mas fácil de manipular grandes bases de datos sin grandes perdidas de tiempo es limitar la búsqueda a valores pequeños y usar filtros para encontrar las entradas que este buscando."
+msgstr ""
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de tener una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la búsqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que este buscando."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4938,13 +4639,17 @@ msgstr "Por favor elija la forma de reaccionar en esta sesión"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignore este error y muestre todas las entradas devueltas por el servidor LDAP"
+msgstr ""
+"ignore este error y muestre todas las entradas devueltas por el servidor "
+"LDAP"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignore este error y muestre todas las entradas que coincidan con el tamaño limite definido y active el uso de filtros en su lugar"
+msgstr ""
+"ignore este error y muestre todas las entradas que coincidan con el tamaño "
+"limite definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4959,12 +4664,16 @@ msgstr ""
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5035,17 +4744,24 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Algunos valores deben ser únicos en el directorio completo mientras que algunas combinaciones no tienen sentido. FusionDirectory muestra los atributos relevantes. Por favor mantenga los valores de abajo para cumplir con las políticas."
+msgstr ""
+"Algunos valores deben ser únicos en el directorio completo mientras que "
+"algunas combinaciones no tienen sentido. FusionDirectory muestra los "
+"atributos relevantes. Por favor mantenga los valores de abajo para cumplir "
+"con las políticas."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
+msgstr ""
+"¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente, puede resultar en errores al pegar el objeto nuevamente!"
+msgstr ""
+"O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente,"
+" puede resultar en errores al pegar el objeto nuevamente!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5153,7 +4869,9 @@ msgstr "No se cambiará su método de hash de la contraseña!"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en todos los programas configurados también."
+msgstr ""
+"Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en"
+" todos los programas configurados también."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 8934aee6dded29ad022c7ff92fa47b8ea2a19d70..ec4e04fda5f0423fe1a3a74fb691b18af7a0b39d 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -1,944 +1,898 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Miguel Ortiz <daychuzleo@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Idioma de instalación"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permitirá elegir su lenguaje preferido."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
-msgstr "En este punto usted puede elegir el idioma por defecto del   sitio. Si elige 'automático'  se utilizará el lenguaje del navegador. Ésta opción puede ser cambiada por el usuario."
+msgstr ""
+"En este punto usted puede elegir el idioma por defecto del   sitio. Si elige"
+" 'automático'  se utilizará el lenguaje del navegador. Ésta opción puede ser"
+" cambiada por el usuario."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automático"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Ubicación"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+"Nombre de esta conexión para mostrar en la lista de servidores de LDAP."
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de conexión"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr "URI para contactar al servidor LDAP. Usualmente comienza con ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Conexión TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr "¿Debería usarse TLS para conectarse a este servidor LDAP?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "El directorio base de LDAP"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"DN de la cuenta admin para conectarse a LDAP. La base se añade "
+"automáticamente."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN para el Administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Contraseña de Administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr "Contraseña para la cuenta de Administrador que será vinculada a LDAP."
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Estado Actual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+"Resultado del último intento al revisar la vinculación con LDAP y los "
+"esquemas básicos."
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuración de LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configuración de conexión LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este mensaje muestra una configuración básica de la conectividad de LDAP con"
+" FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "¡La vinculación anónima al servidor %s ha fallado!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Falló la vinculación con el usuario '%s'"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "¡La vinculación anónima al servidor %s ha funcionado!"
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "¡Por favor especifique su usuario y contraseña!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "¡Ha funcionado la vinculación del usuario '%s' al servidor '%s'!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Precacuión"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Error en la configuración"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completado"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Siguiente"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finalizar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Finalizar - Crear el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Crear el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Su archivo de configuración no debería tener permisos de lectura para todos "
+"los usuarios. ¡Por favor actualice los permisos!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+"No se puede acceder al archivo de configuración porque no existe o no tiene "
+"permisos de lectura sobre él."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Después de descargar y colocar el archivo en %s, por favor verifique que el "
+"usuario con el cual está ejecutándose el servidor web tiene acceso a %s. "
+"Otros usuarios no deberían tener acceso."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Verificación de extensiones y módulos PHP "
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
-msgstr "Configuración de la instalación de PHP (<a href=\"?info\" target=\"_blank\">Mostrar información</a>)"
+msgstr ""
+"Configuración de la instalación de PHP (<a href=\"?info\" "
+"target=\"_blank\">Mostrar información</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Revisión de la instalación"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Revisión básica de Extensiones PHP y compatibilidad"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Revisando la versión PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP debe tener una versión %s o superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor actualice a una versión soportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory requiere este módulo para comunicarse con su servidor LDAP."
+msgstr ""
+"FusionDirectory requiere este módulo para comunicarse con su servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory requiere este módulo para una inferfaz internacionalizada."
+msgstr ""
+"FusionDirectory requiere este módulo para una inferfaz internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory requiere este módulo para comunicarse con diferentes tipos de servidores y protocolos."
+msgstr ""
+"FusionDirectory requiere este módulo para comunicarse con diferentes tipos "
+"de servidores y protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory necesita éste módulo para la integración con Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory requiere el módulo 'mhash' o bien 'sha1' para usar encripción por SSHA."
+msgstr ""
+"FusionDirectory requiere el módulo 'mhash' o bien 'sha1' para usar "
+"encripción por SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory requiere este módulo para comunicarse con un servidor IMAP."
+msgstr ""
+"FusionDirectory requiere este módulo para comunicarse con un servidor IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requiere este módulo para manejar strings unicoide."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "módulo de compresión"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requiere esta extensión para manejar snapshots."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals  es un mecanismo PHP para registrar todas las variables globales y que puedan accederse mediante scripts sin cambiar el foco. Esto puede ser un riesgo de seguridad."
+msgstr ""
+"register_globals  es un mecanismo PHP para registrar todas las variables "
+"globales y que puedan accederse mediante scripts sin cambiar el foco. Esto "
+"puede ser un riesgo de seguridad."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Buscar por 'register_globals' en su archivo php.ini y cámbielo a 'Off'."
+msgstr ""
+"Buscar por 'register_globals' en su archivo php.ini y cámbielo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP utiliza este valor para que el colector de basura borre las sesiones obsoletas."
+msgstr ""
+"PHP utiliza este valor para que el colector de basura borre las sesiones "
+"obsoletas."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Configurando este valor a 'un día' prevendrá perder sesiones y cookies antes de que realmente expiren."
+msgstr ""
+"Configurando este valor a 'un día' prevendrá perder sesiones y cookies antes"
+" de que realmente expiren."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Buscar por  'session.gc_maxlifetime' en su archivo php.ini y configurarlo a 86400 o superior."
+msgstr ""
+"Buscar por  'session.gc_maxlifetime' en su archivo php.ini y configurarlo a "
+"86400 o superior."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Apagado"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Para utilizar FusionDirectory sin problemas la opción session.auto_start  en su archivo php.ini debe estar configurada en 'Off'."
+msgstr ""
+"Para utilizar FusionDirectory sin problemas la opción session.auto_start  en"
+" su archivo php.ini debe estar configurada en 'Off'."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Buscar  'session.auto_start'  en su archivo php.ini y configurarlo en 'Off'."
+msgstr ""
+"Buscar  'session.auto_start'  en su archivo php.ini y configurarlo en 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory requiere al menos 128MB de memoria. Si usted utiliza menos que esto ¡puede causar errores que no son reproducibles! aumente la memoria para instalaciones grandes."
+msgstr ""
+"FusionDirectory requiere al menos 128MB de memoria. Si usted utiliza menos "
+"que esto ¡puede causar errores que no son reproducibles! aumente la memoria "
+"para instalaciones grandes."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Buscar 'memory_limit' en su archivo php.ini y configurarlo con '128MB' o superior."
+msgstr ""
+"Buscar 'memory_limit' en su archivo php.ini y configurarlo con '128MB' o "
+"superior."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Esta opción afecta el manejo de la salida PHP. Deshabilitar esta opción con 'off' mejorará el rendimiento."
+msgstr ""
+"Esta opción afecta el manejo de la salida PHP. Deshabilitar esta opción con "
+"'off' mejorará el rendimiento."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr "Busca 'omplicit_flush' en su archivo php.ini y lo establece como 'Off'."
+msgstr ""
+"Busca 'omplicit_flush' en su archivo php.ini y lo establece como 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "El tiempo de ejecución debería ser al menos de 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Busca 'max_execution_time' en su archivo php.ini y lo establece como '30' o superior."
+msgstr ""
+"Busca 'max_execution_time' en su archivo php.ini y lo establece como '30' o "
+"superior."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Incrementa la seguridad del servidor estableciendo 'expose_php' como 'Off'. PHP no enviará información de su  servidor en este caso."
+msgstr ""
+"Incrementa la seguridad del servidor estableciendo 'expose_php' como 'Off'. "
+"PHP no enviará información de su  servidor en este caso."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busca 'expose_php' en su archivo php.ini y lo establece como 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Incrementa el rendimiento del servidor estableciendo 'magic_quotes_gpc' como 'Off'."
+msgstr ""
+"Incrementa el rendimiento del servidor estableciendo 'magic_quotes_gpc' como"
+" 'Off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Busca  'zend.ze1_compatibility_mode' en su archivo php.ini y lo establece como 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenido al asistente de configuración de FusionDirectory."
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Mensaje de bienvenida"
+msgstr ""
+"Busca  'zend.ze1_compatibility_mode' en su archivo php.ini y lo establece "
+"como 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Revisión de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Se va a analizar la compatibilidad entre LDAP y FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Otorgar todos los permisos en usuarios que pertenezcan a dicha rama."
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
-msgstr "Permitir a los usuarios editar su propia información (Pestaña de Inicio y posix, usar únicamente en base)"
+msgstr ""
+"Permitir a los usuarios editar su propia información (Pestaña de Inicio y "
+"posix, usar únicamente en base)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
-msgstr "Permitir a los usuarios editar su propia contraseña (Solo en las pestañas POSIX e Inicio)"
+msgstr ""
+"Permitir a los usuarios editar su propia contraseña (Solo en las pestañas "
+"POSIX e Inicio)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Revisar las clases del objeto 'root'"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Revisar los permisos para la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Revisar si existen Divisiones ocultas"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Falló"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "¡No se encuentra el objeto clase '%s' de FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Por favor verifique su instalación."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "No es posible utilizar el tipo de objeto estructurado de su objeto 'root'. Por favor intente agregar el objeto clase '%s' manualmente."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"No es posible utilizar el tipo de objeto estructurado de su objeto 'root'. "
+"Por favor intente agregar el objeto clase '%s' manualmente."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
-msgstr "El usuario \"%s\" especificado no tiene acceso completo a la base de datos LDAP."
+msgstr ""
+"El usuario \"%s\" especificado no tiene acceso completo a la base de datos "
+"LDAP."
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
-msgstr "El usuario \"%s\" especificado no tiene acceso completo a la base de datos ldap."
-
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Advertencia"
+msgstr ""
+"El usuario \"%s\" especificado no tiene acceso completo a la base de datos "
+"ldap."
 
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Se encontraron %s usuario(s) que no estarán visibles en FusionDirectory o que están incompletos."
+msgstr ""
+"Se encontraron %s usuario(s) que no estarán visibles en FusionDirectory o "
+"que están incompletos."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Migración de Usuario"
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "No se puede migrar la entrada \"%s\":"
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Se encontraron cuentas administrativas de FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Se encontraron grupos administrativos de FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr "Usted debe ejecutar <i>fusiondirectory-setup-migrate-acls</i> después de salvar su archivo de configuración al terminar la configuración general para migrarlo. <br/>"
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr "No hay un administrador válido de FusionDirectory 1.0.8  en su LDAP."
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crear"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr ""
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador de FusionDirectory en su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crear"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Dar permisos en todos los objetos."
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Error"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "Los roles ACL por defecto no han sido insertados"
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "No se encuentran algunos de los roles ACL por defecto"
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Los roles ACL por defecto han sido insertados"
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "No es posible agregar el rol ACL \"%s\":"
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, 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_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios dentro del árbol configurado"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr "¡No se pueden mover entradas en la División seleccionada!"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "La entrada será movida desde "
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias serán actualizadas"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Se encontraron %s grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Mover grupos dentro del árbol configurado"
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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."
+msgstr ""
+"Se encontraron %s Division(es) que no serán visibles en FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr "Migración de Divisiones."
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Ubicación"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr "Nombre de esta conexión para mostrar en la lista de servidores de LDAP."
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de conexión"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI para contactar al servidor LDAP. Usualmente comienza con ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Conexión TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "¿Debería usarse TLS para conectarse a este servidor LDAP?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "El directorio base de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr "DN de la cuenta admin para conectarse a LDAP. La base se añade automáticamente."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN para el Administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Contraseña de Administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr "Contraseña para la cuenta de Administrador que será vinculada a LDAP."
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Estado Actual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr "Resultado del último intento al revisar la vinculación con LDAP y los esquemas básicos."
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuración de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configuración de conexión LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Este mensaje muestra una configuración básica de la conectividad de LDAP con FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "¡La vinculación anónima al servidor %s ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Falló la vinculación con el usuario '%s'"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "¡La vinculación anónima al servidor %s ha funcionado!"
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "¡Por favor especifique su usuario y contraseña!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "¡Ha funcionado la vinculación del usuario '%s' al servidor '%s'!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finalizar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Finalizar - Crear el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Crear el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Su archivo de configuración no debería tener permisos de lectura para todos los usuarios. ¡Por favor actualice los permisos!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "No se puede acceder al archivo de configuración porque no existe o no tiene permisos de lectura sobre él."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Después de descargar y colocar el archivo en %s, por favor verifique que el usuario con el cual está ejecutándose el servidor web tiene acceso a %s. Otros usuarios no deberían tener acceso."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Error en la configuración"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Completado"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenido al asistente de configuración de FusionDirectory."
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Siguiente"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Mensaje de bienvenida"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Error Interno"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡El objectType especificado está vacío o es inválido!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "Aún sin configurar"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Error al filtrar"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "¡El filtro está incompleto!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Permisos"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Usted no tiene permitido crear un 'snashot' para %s."
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Usted no tiene permitido restaurar un 'snapshot' para %s"
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "No se encontró la etiqueta '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Arriba"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
-msgstr "Ordenar "
+msgstr "Ordenar"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr "Ordenar de modo inverso"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Error"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "creado por"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Ir a la División raíz"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Subir una División"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr "Ir a la División del usuario"
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Refrescar lista"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Cortar"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Cortar esta entrada"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Restaurar 'snapshots'"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Restaurar 'snapshot'"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Crear 'snapshot'"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Crear un nuevo 'snapshot' de este objeto"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "in"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "en línea"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Erro XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -948,14 +902,16 @@ msgstr "No se puede cambiar la contraseña, usuario desconocido '%s'"
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
-msgstr "Usted debe completar saslRealm o saslExop en la pantalla de configuración para usar SASL"
-
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+msgstr ""
+"Usted debe completar saslRealm o saslExop en la pantalla de configuración "
+"para usar SASL"
+
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error de configuración"
@@ -981,308 +937,304 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "El canal requerido no existe. Por favor contacte a su administrador."
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Permisos"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "No se puede pegar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
-msgstr "Cuenta de usuario"
+msgstr "Usuario"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Error fatal: No se puede ejemplificar la clase '%s' - intente ejecutar '%s' para arreglar esto."
+msgstr ""
+"Error fatal: No se puede ejemplificar la clase '%s' - intente ejecutar '%s' "
+"para arreglar esto."
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Error fatal"
+
+#: include/functions.inc:475
 #, 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:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
-msgstr "¡Login (uid) no es un valor único en el árbol LDAP!. Por favor contacte a su administrador."
+msgstr ""
+"¡Login (uid) no es un valor único en el árbol LDAP!. Por favor contacte a su"
+" administrador."
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
-msgstr "Al parecer tu contraseña expiró. Por favor acceda a<a href=\"recovery.php\">Recuperar contraseña</a> y cámbiela."
+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:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Error mientras agregando un bloqueo. ¡Contacte a los desarrolladores!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "No se puede crear un bloqueo de información en el árbol de 'LDAP'. ¡Por favor contacte a su administrador!"
+msgstr ""
+"No se puede crear un bloqueo de información en el árbol de 'LDAP'. ¡Por "
+"favor contacte a su administrador!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP respondió: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Se encontraron varios 'locks' en el objeto lo cual impide bloquearlo. Esto no debería suceder - borrando varias referencias."
+msgstr ""
+"Se encontraron varios 'locks' en el objeto lo cual impide bloquearlo. Esto "
+"no debería suceder - borrando varias referencias."
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuar de todos modos"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar de todos modos"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Resultados por página"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "El archivo '%s' no se puede borrar. Intente ejecutar fusiondirectory-setup-check-directories para arreglar los permisos."
-
-#: include/functions.inc:2297
-msgid "Cannot write to revision file!"
 msgstr ""
+"El archivo '%s' no se puede borrar. Intente ejecutar fusiondirectory-setup-"
+"check-directories para arreglar los permisos."
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
+#: include/functions.inc:1874
+msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP - Advertencia"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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'"
+msgstr ""
+"No se puede traer información del 'schema' desde el servidor. ¡No se puede "
+"validar el schema'"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
-msgstr "Usted ha instalado el plugin 'Mixed Groups', pero la configuración de su esquema no lo soporta."
+msgstr ""
+"Usted ha instalado el plugin 'Mixed Groups', pero la configuración de su "
+"esquema no lo soporta."
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
-msgstr "Su esquema tiene configurado soporte para 'Mixed Groups', pero este plugin no está presente."
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "¡método 'idAllocation' desconocido!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "!sambaUnixIdPool no es un valor único!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
 msgstr ""
+"Su esquema tiene configurado soporte para 'Mixed Groups', pero este plugin "
+"no está presente."
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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."
+msgstr ""
+"No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar "
+"esto."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Por favor solucione el error anterior y recargue la página."
 
@@ -1291,46 +1243,48 @@ msgstr "Por favor solucione el error anterior y recargue la página."
 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_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr "No se puede contactar a LDAP. Por favor contacte al adminsitrador del sistema."
+msgstr ""
+"No se puede contactar a LDAP. Por favor contacte al adminsitrador del "
+"sistema."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "La característica 'snapshot' está habilitada, pero la variable '%s' requerida no está configurada."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "La funcionalidad de 'snapshot' está habilitada, pero el módulo de compresión requerido no se encuentra. Por favor instale '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -1353,7 +1307,7 @@ msgstr "Elegir para listar todos los objetos que posean '%s' habilitado."
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
@@ -1602,8 +1556,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1611,7 +1564,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
@@ -1667,255 +1620,268 @@ msgstr "¡Esta cuenta no tiene extensiones %s válidas!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Ésta cuenta tiene %s configuraciones habilitadas. Usted puede deshabilitarlas haciendo clic debajo."
+msgstr ""
+"Ésta cuenta tiene %s configuraciones habilitadas. Usted puede "
+"deshabilitarlas haciendo clic debajo."
 
 #: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Ésta cuenta tiene  %s configuraciones habilitadas. ¡Para deshabilitarlas deberá borrar el %s de configuraciones primero!"
+msgstr ""
+"Ésta cuenta tiene  %s configuraciones habilitadas. ¡Para deshabilitarlas "
+"deberá borrar el %s de configuraciones primero!"
 
 #: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Ésta cuenta tiene %s configuraciones deshabilitadas. Usted puede habilitarlas haciendo clic debajo."
+msgstr ""
+"Ésta cuenta tiene %s configuraciones deshabilitadas. Usted puede "
+"habilitarlas haciendo clic debajo."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Ésta cuenta tiene %s configuraciones deshabilitadas. ¡Para habilitarlas usted deberá agregar el %s de configuraciones primero!"
+msgstr ""
+"Ésta cuenta tiene %s configuraciones deshabilitadas. ¡Para habilitarlas "
+"usted deberá agregar el %s de configuraciones primero!"
+
+#: include/class_msgPool.inc:614
+#, 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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Agregar %s configuraciones "
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Borrar %s configuraciones "
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "¡Falló la operación en la base de datos!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "leer operación"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "agregar operación"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modificar operación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "borrar operación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "buscar operación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s falló!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "¡La operación en LDAP ha fallado!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "¡La subida del archivo ha fallado!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "¡La subida del archivo: %s ha fallado!"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Falló la comunicación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, 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:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Este '%s' sigue en uso."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "No se puede eliminar el archivo '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede borrar el directorio '%s'!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "No se puede inicializar la clase '%s'! ¿Quizás hay algún plugin mal instalado en su configuración de FusionDirectory?"
+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:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1957,7 +1923,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Snapshots"
 
@@ -2021,81 +1986,87 @@ msgstr "Enviar reporte de errores"
 msgid "Toggle information"
 msgstr "Alternar información"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Advertencia de Rendmiento"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras se realizan operaciones en el servidor LDAP %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open falló al ejecutar ldapsearch"
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2103,13 +2074,12 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descripción"
@@ -2120,11 +2090,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Rol %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Grupo %s"
@@ -2161,8 +2133,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2171,130 +2143,156 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Borrar"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "No se encontraron descripciones para iniciar '%s', por favor revise su archivo de configuración."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "El proceso de borrado fue cancelado por el plugin '%s': %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "A partir de plantilla"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "%s plantilla"
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Error al filtrar"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "¡El filtro está incompleto!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Error de permisos"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "SIN ETIQUETA"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr "Configuraciones de Plantilla"
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Este es el nombre de la plantilla"
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr "Solo la pestaña principal puede calcular dn"
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, 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:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
-msgstr "No es posible calcular dn: No se encuentra el objectType infos desde la pestaña clase \"%s\""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Error al salvar"
+msgstr ""
+"No es posible calcular dn: No se encuentra el objectType infos desde la "
+"pestaña clase \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "La entrada %s no existe"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Pestaña \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2334,8 +2332,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Subir"
 
@@ -2344,7 +2342,7 @@ msgstr "Subir"
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2395,27 +2393,10 @@ msgstr "Un número flotante mayor que %f"
 msgid "A float smaller than %f"
 msgstr "Un número flotante menor que %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Hubo un problema descomprimiendo la información del snapshot."
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Pestaña \"%s\""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2434,7 +2415,9 @@ msgstr "Roles ACL"
 msgid ""
 "Unkown ACL type '%s'!\n"
 "You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
-msgstr "¡Tipo de ACL '%s' desconocido!\nPuede que usted necesite ejecutar \"fusiondirectory-setup --migrate-acls\"  para migrar sus acls al nuevo formato."
+msgstr ""
+"¡Tipo de ACL '%s' desconocido!\n"
+"Puede que usted necesite ejecutar \"fusiondirectory-setup --migrate-acls\"  para migrar sus acls al nuevo formato."
 
 #: include/class_acl.inc:170
 #, php-format
@@ -2446,11 +2429,15 @@ msgstr "¡Entrada desconocida '%s'!"
 msgid "All users"
 msgstr "Todos los usuarios"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder al directorio '%s' especificado para compilar!"
@@ -2471,7 +2458,10 @@ msgstr ""
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "El archivo de configuración de FusionDirectory  %s/%s no tiene privilegios de lectura. Por favor ejecute \"fusiondirectory-setup --check-config\" para corregir éste problema."
+msgstr ""
+"El archivo de configuración de FusionDirectory  %s/%s no tiene privilegios "
+"de lectura. Por favor ejecute \"fusiondirectory-setup --check-config\" para "
+"corregir éste problema."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2519,45 +2509,44 @@ 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:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte a su administrador!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Su navegador tiene las cookies deshabilitadas. ¡Por favor habilítelas y recarge la página antes de iniciar sesión!"
+msgstr ""
+"Su navegador tiene las cookies deshabilitadas. ¡Por favor habilítelas y "
+"recarge la página antes de iniciar sesión!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. Abortado."
+msgstr ""
+"La configuración %s/%s de FusionDirectory no tiene permisos de lectura. "
+"Abortado."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2590,15 +2579,18 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo."
+msgstr ""
+"Contacte a su administrador, hubo un problema con el servidor de correo."
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Este token es inválido"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 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á enviada."
+msgstr ""
+"Hay un problema con el servidor de correo, la confirmación de email no será "
+"enviada."
 
 #: html/main.php:115
 msgid "PHP configuration"
@@ -2608,7 +2600,9 @@ msgstr "Configuración PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Error fatal: Registrar 'globales' está habilitado. FusionDirectory rechazará el inicio de sesión hasta que esto sea solucionado por un administrador."
+msgstr ""
+"Error fatal: Registrar 'globales' está habilitado. FusionDirectory rechazará"
+" el inicio de sesión hasta que esto sea solucionado por un administrador."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2616,7 +2610,8 @@ msgstr "Cambio de contraseña"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "Su contraseña está a punto de expirar, ¡por favor cambie su contraseña!"
+msgstr ""
+"Su contraseña está a punto de expirar, ¡por favor cambie su contraseña!"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2639,7 +2634,9 @@ msgstr "Plugin"
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
-msgstr "Error Fatal: ¡No es posible encontrar ninguna definición de plugin para el plugin '%s' ('%s' no es un archivo)!"
+msgstr ""
+"Error Fatal: ¡No es posible encontrar ninguna definición de plugin para el "
+"plugin '%s' ('%s' no es un archivo)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
@@ -2650,7 +2647,9 @@ msgstr "Error de configuración"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Error Fatal: ¡Algunas de las variables POST no se han transferido por PHP - por favor informe a su administrador!"
+msgstr ""
+"Error Fatal: ¡Algunas de las variables POST no se han transferido por PHP - "
+"por favor informe a su administrador!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2663,225 +2662,8 @@ msgstr "¡Bienvenido  %s!"
 msgid "References"
 msgstr "Referencias"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Editar configuración POSIX de los usuarios"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "'Home' del usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "La ruta al nuevo directorio 'home' del usuario."
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Qué 'shells' deberían usarse cuando este usuario inicie sesión."
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Grupo Primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Grupo primario para este usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Estado de la cuenta Unix de este usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Forzar 'id' de usuario/grupo "
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Forzar los valores 'id' y 'group id' para éste usuario."
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "id de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Forzar valor 'id' para este usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "id de Grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Forzar valor 'Group id' para este usuario."
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Pertenencia a grupos"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Cuenta de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "El usuario debe cambiar su contraseña en el primer inicio de sesión."
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "El usuario debe cambiar su contraseña en el primer inicio de sesión (necesita un valor de retraso antes de forzar el cambio de contraseña)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Retraso antes de forzar el cambio de contraseña (días)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "El usuario será forzado a cambiar su contraseña después de este número de días (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Fecha de caducidad para la contraseña"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "La fecha tras la cual la contraseña de este usuario va a caducar (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Retraso de inactividad antes de deshabilitar el usuario (días)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Luego de que caduque la contraseña del usuario, tiempo máximo de retraso antes de deshabilitar la cuenta del usuario (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Retraso para avisar al usuario sobre el vencimiento de su contraseña (días)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "El usuario será advertido esta cantidad de días antes de que su contraseña caduque (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Confianza del Sistema"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Modo de Confianza"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Tipo de autorización para ésos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "deshabilitado"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "Acceso Completo"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "Permitir acceso a ésos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Permitir a este usuario conectarse a esta lista de hosts."
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "expirado"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Período de gracia activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "Contraseña expirada"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "Contraseña no modificable"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Tiempo de espera superado mientras se esperaba el bloqueo. ¡Ignorando el bloqueo!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Grupo del usuario %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Grupos y Roles"
 
@@ -2908,7 +2690,7 @@ 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:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2929,280 +2711,303 @@ msgstr "Su contraseña de nuevo"
 msgid "Same password as above, to avoid errors"
 msgstr "Igual a la contraseña anterior para evitar errores"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Información de Cuentas de Usuario"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Cuenta de Usuario"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Apellido de este usuario"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Primer nombre"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Primer nombre de este usuario"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Descripción corta para éste usuario"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Imagen"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "El avatar para este usuario"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Información de contacto Profesional"
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Ubicación"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Dirección postal de trabajo"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Habitación Nro."
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Número telefónico de trabajo"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Celular de trabajo"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Bíper"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Bíper laboral"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Nro. Fax de trabajo"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página web"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Página web personal"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Información de cuenta"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Cuenta de este usuario"
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Contraseña del usuario"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Información de contacto 'Personal'"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Dirección personal"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
-msgstr "Código postal personal"
+msgstr "Código postal"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Teléfono de domicilio personal"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Información Profesional"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Tratamiento 'Sr, Sra...'"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
-msgstr "Tratamiento 'Dr, Ing, Sr, Sra ...' en un contexto profesional. Cada tratamiento es un valor de sus múltiples atributos."
+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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
-msgstr "División"
+msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "División No."
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número de División"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Empleado N°"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Mánager"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, 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:614
+#: plugins/personal/generic/class_user.inc:662
 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:625
+#: plugins/personal/generic/class_user.inc:673
 #, 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."
+msgstr ""
+"Usted debe esperar %d segundos antes de cambiar su contraseña de nuevo."
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 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:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 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:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
-msgstr "Las contraseñas que usted ingresó como \"Nueva contraseña\" y \"Repetir nueva contraseña\" no coinciden."
+msgstr ""
+"Las contraseñas que usted ingresó como \"Nueva contraseña\" y \"Repetir "
+"nueva contraseña\" no coinciden."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "La contraseña nueva es muy corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
-msgstr "La contraseña posiblemente contiene caracteres 'Unicoide' que son problemáticos."
+msgstr ""
+"La contraseña posiblemente contiene caracteres 'Unicoide' que son "
+"problemáticos."
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:28
 msgid "Statistics about users"
@@ -3270,7 +3075,8 @@ msgstr "Habilitar recuperación de contraseña."
 
 #: plugins/config/class_recoveryConfig.inc:46
 msgid "Whether to activate or not password recovery feature"
-msgstr "Elegir cuando activar la característica de recuperación de contraseña."
+msgstr ""
+"Elegir cuando activar la característica de recuperación de contraseña."
 
 #: plugins/config/class_recoveryConfig.inc:51
 msgid "Sender email address"
@@ -3296,7 +3102,9 @@ msgstr "'Salt' para 'tokens''"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Solo una medida de seguridad, usted puede incluir cualquier cosa aquí, incluso caracteres aleatorios."
+msgstr ""
+"Solo una medida de seguridad, usted puede incluir cualquier cosa aquí, "
+"incluso caracteres aleatorios."
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3306,10 +3114,12 @@ msgstr "Habilitar el uso de correos alternativos"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Los usuarios también podrán una dirección alternativa para recuperar su contraseña."
+msgstr ""
+"Los usuarios también podrán una dirección alternativa para recuperar su "
+"contraseña."
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Cuenta de Usuario"
 
@@ -3345,7 +3155,10 @@ msgstr "Mensaje (primer %s es Cuenta de usuario,  el segundo es 'Enlace')"
 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 "Mensaje del primer correo enviado cuando el usuario solicita una nueva contraseña. Utilice %s para la cuenta de usuario y el enlace de recuperación de contraseña."
+msgstr ""
+"Mensaje del primer correo enviado cuando el usuario solicita una nueva "
+"contraseña. Utilice %s para la cuenta de usuario y el enlace de recuperación"
+" de contraseña."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3381,7 +3194,9 @@ msgstr "Mensaje (%s es cuenta de usuario)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Mensaje del segundo correo enviado al confirmar el cambio de contraseña. Utilice %s para la cuenta de usuario."
+msgstr ""
+"Mensaje del segundo correo enviado al confirmar el cambio de contraseña. "
+"Utilice %s para la cuenta de usuario."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3390,7 +3205,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Hola,\n\nSu contraseña se ha cambiado.\nSu cuenta de usuario sigue siendo %s."
+msgstr ""
+"Hola,\n"
+"\n"
+"Su contraseña se ha cambiado.\n"
+"Su cuenta de usuario sigue siendo %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3418,7 +3237,10 @@ msgstr "Idioma"
 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 "Idioma de la aplicación. Si utiliza 'automático' o no disponible, se preguntará al navegador cuál utilizar. Ésta opción puede ser cambiada por el usuario."
+msgstr ""
+"Idioma de la aplicación. Si utiliza 'automático' o no disponible, se "
+"preguntará al navegador cuál utilizar. Ésta opción puede ser cambiada por el"
+" usuario."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3437,527 +3259,491 @@ msgid "Timezone to be used"
 msgstr "Zona Horaria a utilizar"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Configuración del esquema 'LDAP'"
+msgid "Core settings"
+msgstr "Configuración del 'Núcleo'"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Tamaño límite LDAP"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr "Determine cuántas entradas se traerán de LDAP por defecto."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Editar bloqueo"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Mientras tanto, revisar si una entrada que está siendo editada ha sido "
+"modificada desde fuera de FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Habilitar escritura de logs"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Escritura de eventos en logs de FusionDirectory"
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr "Validación del esquema 'LDAP'"
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
-msgstr "Habilita la validación del esquema 'LDAP' durante el inicio de sesión."
+msgstr ""
+"Habilita la validación del esquema 'LDAP' durante el inicio de sesión."
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Habilitar snapshots"
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Permite que usted salve ciertos estados o entradas para luego restaurarlas."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base para Snapshot "
+
+#: plugins/config/class_configInLdap.inc:141
+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
 msgid "Password settings"
 msgstr "Configuraciones de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "'hash' de contraseña por defecto."
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "'hash' por defecto"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Forzar 'hash' por defecto"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 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:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Longitud mínima de contraseña"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Longitud máxima de contraseña para usuarios"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Diferencia mínima entre contraseñas"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
-msgstr "Cantidad mínima de caracteres distintos a partir de la última contraseña"
+msgstr ""
+"Cantidad mínima de caracteres distintos a partir de la última contraseña"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Expiración de la cuenta de usuario"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
-msgstr "Habilita pruebas del atributo 'shadow'  durante el proceso de inicio de sesión en FusionDirectory y fuerza la renovación de contraseña o bloqueo de cuenta."
+msgstr ""
+"Habilita pruebas del atributo 'shadow'  durante el proceso de inicio de "
+"sesión en FusionDirectory y fuerza la renovación de contraseña o bloqueo de "
+"cuenta."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr "Valor que será almacenado en el atributo 'userPassword'"
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Configuración del 'Núcleo'"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Muestra un resumen en los listados."
-
-#: plugins/config/class_configInLdap.inc:162
-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 "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:167
-msgid "Edit locking"
-msgstr "Editar bloqueo"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Mientras tanto, revisar si una entrada que está siendo editada ha sido modificada desde fuera de FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Habilitar escritura de logs"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Escritura de eventos en logs de FusionDirectory"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Tamaño límite LDAP"
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Determine cuántas entradas se traerán de LDAP por defecto."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr "Valor que será almacenado en el atributo 'userPassword'"
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Cuenta de Usuario y sesión"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 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."
+msgstr ""
+"Que atributo LDAP debería usarse como 'cuenta de usuario' en el inicio de "
+"sesión."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forzar las conexiones encriptadas"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Habilita revisiones de seguridad con PHP para forzar el acceso encriptado (https) en la interfaz web."
+msgstr ""
+"Habilita revisiones de seguridad con PHP para forzar el acceso encriptado "
+"(https) en la interfaz web."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Alertar si la sesión no se encuentra encriptada"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 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."
+msgstr ""
+"mostrará un mensaje de advertencia al usuario cuando se utilice http en vez "
+"de https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Tiempo de vida de la sesión "
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Habilitar snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Permite que usted salve ciertos estados o entradas para luego restaurarlas."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base para Snapshot "
-
-#: plugins/config/class_configInLdap.inc:237
-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:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Ruta de la llave "
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
-msgstr "Ruta donde se encuentra la llave de FusionDirectory. Por el momento, sin uso."
+msgstr ""
+"Ruta donde se encuentra la llave de FusionDirectory. Por el momento, sin "
+"uso."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Ruta del certificado"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 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:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Path del certificado CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 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'."
+msgstr ""
+"Ruta del certificado CA. Se utiliza para validar el equipo con el 'Servidor "
+"Argonaut'."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Equipo"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Almacenamiento de 'Usuarios' y 'Grupos'"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Atributo DN para 'Usuarios'"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Atributo al inicio del \"dn\" de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Patrón para CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 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:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Politica de nombres"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 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:314
-msgid "Group/user min id"
-msgstr "Grupo/usuario min id"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr "El número 'id' mínimo asignable a un usuario o grupo para evitar fallas de seguridad como cuentas de usuario con id '0'."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Siguiente id hook"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr "Un script que buscará el siguiente número \"id\" libre para usuarios o grupos."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Número base para 'id' de usuario"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Dónde buscar un id libre de usuario."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Número base para 'id' de grupo"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Dónde buscar un id libre de grupo"
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Usuarios RDN"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "La rama donde los usuarios están guardados."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Grupos RDN"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "La rama donde se guardan los grupos."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "ACL Rol RDN"
 
-#: plugins/config/class_configInLdap.inc:346
+#: 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:351
-msgid "Id allocation method"
-msgstr "Método para asignar 'ids'"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Método para asignar 'ids' de grupo/usuario"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradicional"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Pool user id min"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Valor mínimo para el valor 'id' del usuario cuando utilice el método 'pool'"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Pool user id max"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Valor máximo para el valor 'id' del usuario cuando utilice el método 'pool'"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Valor mínimo para id de 'grupo' cuando se utilice el método 'pool'"
+#: 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:372
-msgid "Pool group id max"
-msgstr "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Valor máximo para el group id cuando se utilice el método pool."
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Rastreo de errores"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Mostrar errores"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "Muesta los errores PHP en la parte superior de la pantalla. esto debería estar deshabilitado en entornos productivos, ya que, en algunos casos podrían mostrarse contraseñas allí."
+msgstr ""
+"Muesta los errores PHP en la parte superior de la pantalla. esto debería "
+"estar deshabilitado en entornos productivos, ya que, en algunos casos "
+"podrían mostrarse contraseñas allí."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo máximo de consultas LDAP."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Detenga las acciones sobre LDAP si no hay respuesta después del tiempo especificado en segundos."
+msgstr ""
+"Detenga las acciones sobre LDAP si no hay respuesta después del tiempo "
+"especificado en segundos."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Escribir logs de las estadísticas LDAP."
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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 "Registrar estadísticas de tiempo de LDAP en 'syslog'. Esto puede ser útil para encontrar problemas o filtros de búsqueda erróneos."
+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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel del 'Rastreo de Errores'"
 
-#: plugins/config/class_configInLdap.inc:403
+#: 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:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Muestra un resumen en los listados."
+
+#: 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 ""
+"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:368
+msgid "Show ACL tab on all objects"
+msgstr "Mostrar pestaña de ACL en todos los objetos."
+
+#: 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 ""
+"Para el uso de permisos ACLs muy específicos usted podría requerir dar "
+"acceso en un objeto particular."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: 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:385
+msgid "Group or role"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Hooks"
+
+#: 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:424
-msgid "tab"
-msgstr "Pestaña"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: 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:429
-msgid "mode"
-msgstr "modo"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Cuándo llamar este comando"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: 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:442
-msgid "Hooks"
-msgstr "Hooks"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Mostrar la salida del 'hook'"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
-msgstr "Si se  habilita, cuando un 'hook' termine exitosamente se mostrará una ventana de diálogo al usuario."
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Shells disponibles"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Shells POSIX disponibles para usuarios de FD."
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Mostrar pestaña de ACL en todos los objetos."
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-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:472
-msgid "Available department categories"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
 msgstr ""
+"Si se  habilita, cuando un 'hook' termine exitosamente se mostrará una "
+"ventana de diálogo al usuario."
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
@@ -3999,7 +3785,9 @@ msgstr "Forzar para solicitar la contraseña"
 msgid ""
 "Useful if you add a hook using password value when SASL user passwords are "
 "edited"
-msgstr "Útil si usted agrega un 'hook' utilizando una contraseña cuando las contraseñas de usuario SASL se editan."
+msgstr ""
+"Útil si usted agrega un 'hook' utilizando una contraseña cuando las "
+"contraseñas de usuario SASL se editan."
 
 #: plugins/config/class_dashBoardConfig.inc:28
 msgid "Dashboard configuration"
@@ -4041,7 +3829,9 @@ msgstr "Cantidad de días"
 msgid ""
 "Number of days before expiration needed for an account to show in the "
 "dashboard next expired accounts list"
-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."
+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/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
@@ -4055,9 +3845,8 @@ msgstr "división"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4185,22 +3974,24 @@ msgstr "Administrar usuarios"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Bloqueo de cuentas"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
-msgstr "El método de contraseña \"%s\" no soporta bloqueos. ¡La cuenta \"%s\" no se ha bloqueado!"
+msgstr ""
+"El método de contraseña \"%s\" no soporta bloqueos. ¡La cuenta \"%s\" no se "
+"ha bloqueado!"
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
@@ -4246,7 +4037,7 @@ msgstr "Borrar usuario"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4266,8 +4057,7 @@ msgid "Information"
 msgstr "Información"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Nombre de este grupo"
 
@@ -4291,164 +4081,159 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Agregar usuarios al rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Administrar grupos y roles"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Editar propiedades de Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar propiedades posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Mostrar grupos del usuario"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Mostrar roles de Profesionales"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Mostrar grupos de aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Mostrar grupos de servidores"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Mostrar grupos de estaciones de trabajo"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Mostrar grupos de Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Mostrar grupos de Terminales"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Mostrar grupos de impresión"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Mostrar grupos de teléfono"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Tipo desconocido: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "¡dn: %s Inexsitente!"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objeto grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Datos del 'objeto grupo'"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
-msgstr "Grupo"
+msgstr "GRupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Una descripción corta de este grupo."
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objetos miembro"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objetos miembro de este grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-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:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr "Alojar estaciones de trabajo y terminales en el mismo grupo no está permitido."
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Confianza del Sistema"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de Grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo de Confianza"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "Información de Grupo POSIX"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Tipo de autorización para ésos equipos"
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "Grupo POSIX"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "deshabilitado"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr "Grupo de Usuarios POSIX"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acceso Completo"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forzar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir acceso a ésos equipos"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "Forzar GID para este grupo"
+#: plugins/admin/groups/class_ogroup.inc:226
+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_group.inc:73
-msgid "GID value for this group"
-msgstr "Valor GID para este grupo"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
+msgstr ""
+"Alojar estaciones de trabajo y terminales en el mismo grupo no está "
+"permitido."
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Miembros del Grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de Grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4497,10 +4282,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr "Panel de gestión de roles ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "¿Se aplicará en todo el subárbol o solo en la base?"
@@ -4678,7 +4459,9 @@ msgstr "Crear una nueva cuenta de administrador para FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "En este paso agregará automáticamente un nuevo super administrador a su árbol LDAP."
+msgstr ""
+"En este paso agregará automáticamente un nuevo super administrador a su "
+"árbol LDAP."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4693,7 +4476,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Parece que es la primera vez que usted inicia FusionDirectory  - aún no se ha encontrado una configuración. Éste fácil asistente intentará ayudarle mientras realiza la configuración inicial."
+msgstr ""
+"Parece que es la primera vez que usted inicia FusionDirectory  - aún no se "
+"ha encontrado una configuración. Éste fácil asistente intentará ayudarle "
+"mientras realiza la configuración inicial."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4725,7 +4511,9 @@ msgstr "Buscar cualquier posible error en la configuración."
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Migrar todas las configuraciones posibles de LDAP - ¡ Por favor cree una copia de seguridad!"
+msgstr ""
+"Migrar todas las configuraciones posibles de LDAP - ¡ Por favor cree una "
+"copia de seguridad!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4736,7 +4524,10 @@ msgid ""
 "For security reasons you need to authenticate for the installation by "
 "creating the file '%1', containing the current session ID on the servers "
 "local filesystem. This can be done by executing the following command:"
-msgstr "Por motivos de seguridad usted necesita autenticarse para esta instalación creando el archivo '%1' con el ID de la sesión actual en el servidor local. Esto se puede hacer ejecutando el siguiente comando:"
+msgstr ""
+"Por motivos de seguridad usted necesita autenticarse para esta instalación "
+"creando el archivo '%1' con el ID de la sesión actual en el servidor local. "
+"Esto se puede hacer ejecutando el siguiente comando:"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -4746,13 +4537,11 @@ msgstr "Cuando haya terminado haga clic en 'Siguiente'."
 msgid "Add required object classes to the LDAP base"
 msgstr "Agregar  'object classes' requeridos en la base de LDAP"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Actual"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Luego de la migración"
 
@@ -4760,51 +4549,65 @@ msgstr "Luego de la migración"
 msgid "Close"
 msgstr "Cerrar"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Mientras revisamos LDAP vamos a buscar algunos inconvenientes comunes que "
+"pueden ocurrir cuando se migra a una administración de FusionDirectory con "
+"LDAP.  Para mejorar su experiencia con los servicios, usted podría "
+"solucionar los siguientes problemas."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Verificar de nuevo"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
-msgstr "Este cuadro de mensaje le permite mover un par de entradas al árbol LDAP configurado. Hacer esto podría arreglar su servicio LDAP."
+msgstr ""
+"Este cuadro de mensaje le permite mover un par de entradas al árbol LDAP "
+"configurado. Hacer esto podría arreglar su servicio LDAP."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
-msgstr "¡Cuidado con ésta opción! Pueden haber referencias que apuntan a ésas entradas. La 'configuración' de FusionDirectory no puede migrar ésas referencias, así que usted podría querer cancelar la migración en éste caso."
+msgstr ""
+"¡Cuidado con ésta opción! Pueden haber referencias que apuntan a ésas "
+"entradas. La 'configuración' de FusionDirectory no puede migrar ésas "
+"referencias, así que usted podría querer cancelar la migración en éste caso."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Mover las entradas seleccionadas a éste árbol."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
-msgstr "Las entradas que se listan actualmente no son visibles en la interfaz de FusionDirectory. Si desea cambiar ésto para un par de entradas únicamente, solo debe seleccionarlas y usar el botón \"Migrar\"."
+msgstr ""
+"Las entradas que se listan actualmente no son visibles en la interfaz de "
+"FusionDirectory. Si desea cambiar ésto para un par de entradas únicamente, "
+"solo debe seleccionarlas y usar el botón \"Migrar\"."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Si usted desea saber qué se hará cuando se migren las entradas seleccionadas, utilice el botón de \"Mostrar Cambios\" para ver el LDIF."
+msgstr ""
+"Si usted desea saber qué se hará cuando se migren las entradas "
+"seleccionadas, utilice el botón de \"Mostrar Cambios\" para ver el LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Mostrar cambios"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Mientras revisamos LDAP vamos a buscar algunos inconvenientes comunes que pueden ocurrir cuando se migra a una administración de FusionDirectory con LDAP.  Para mejorar su experiencia con los servicios, usted podría solucionar los siguientes problemas."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Verificar de nuevo"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Crear su archivo de configuración"
@@ -4843,7 +4646,10 @@ msgstr ""
 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 "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'. "
+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
@@ -4880,7 +4686,9 @@ msgstr "Su contraseña ha sido cambiada con éxito."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Ingrese su dirección de correo actual en el siguiente campo y presione el botón 'Cambiar'."
+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
 msgid ""
@@ -4896,7 +4704,9 @@ msgstr ""
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "La recuperación de contraseña no está disponible. Si usted perdió su contraseña por favor contacte a su administrador."
+msgstr ""
+"La recuperación de contraseña no está disponible. Si usted perdió su "
+"contraseña por favor contacte a su administrador."
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4906,7 +4716,9 @@ msgstr "Pantalla de Acceso"
 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."
+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
@@ -4939,13 +4751,16 @@ msgstr "Por favor elija la forma de interactuar con esta sesión"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignore este error y muestre todas las entradas que regresa el servidor LDAP"
+msgstr ""
+"ignore este error y muestre todas las entradas que regresa el servidor LDAP"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignore este error y muestre todas las entradas que cumplen con el tamaño límite definido y en cambio permitame utilizar filtros "
+msgstr ""
+"ignore este error y muestre todas las entradas que cumplen con el tamaño "
+"límite definido y en cambio permitame utilizar filtros "
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4960,12 +4775,15 @@ msgstr "¡Advertencia!: Usted está a punto de borrar los siguientes objetos"
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Si está seguro presione 'Eliminar' para continuar o 'Cancelar' para abortar."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5036,17 +4854,26 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Algunos valores necesitan ser únicos en todo el directorio, algunas combinaciones no serán posibles. FusionDirectory muestra los atributos pertinentes. Por favor mantenga bajos los valores para cumplir con las políticas."
+msgstr ""
+"Algunos valores necesitan ser únicos en todo el directorio, algunas "
+"combinaciones no serán posibles. FusionDirectory muestra los atributos "
+"pertinentes. Por favor mantenga bajos los valores para cumplir con las "
+"políticas."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "¡Recuerde que algunas de las propiedades como los 'snapshots' realizados no serán copiadas!"
+msgstr ""
+"¡Recuerde que algunas de las propiedades como los 'snapshots' realizados no "
+"serán copiadas!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "O si usted copia o corta na entrada dentro de FusionDirectory y borra el objeto original, usted podría tener errores en el futuro cuando pegue este objeto nuevamente."
+msgstr ""
+"O si usted copia o corta na entrada dentro de FusionDirectory y borra el "
+"objeto original, usted podría tener errores en el futuro cuando pegue este "
+"objeto nuevamente."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5112,7 +4939,9 @@ msgstr "<strong>%1</strong>referencia nuestro<strong>%3</strong>"
 msgid ""
 "<strong>%1</strong> references our field <strong>%3</strong> from tab "
 "<strong>%2</strong>"
-msgstr "<strong>%1</strong> referencia nuestro campo <strong>%3</strong> en el tab <strong>%2</strong>"
+msgstr ""
+"<strong>%1</strong> referencia nuestro campo <strong>%3</strong> en el tab "
+"<strong>%2</strong>"
 
 #: plugins/generic/references/contents.tpl.c:8
 msgid "This object has no relationship to other objects."
@@ -5154,19 +4983,21 @@ msgstr "¡Su metodo de contraseña hash no será cambiado!"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Usted ha cambiado exitosamente su contraseña. Recuerde cambiar todos los programas configurados para usarla también."
+msgstr ""
+"Usted ha cambiado exitosamente su contraseña. Recuerde cambiar todos los "
+"programas configurados para usarla también."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
 msgid_plural "There are %1 groups:"
-msgstr[0] "Existe 1 grupo:"
-msgstr[1] "Existen %1 grupos:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] "Uno de ellos es un %1 grupo"
-msgstr[1] "%2 son %1 grupos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "There is no %1 group"
@@ -5176,14 +5007,14 @@ msgstr "No existe el grupo %1"
 #: plugins/addons/dashboard/pwd_stats.tpl.c:2
 msgid "There is 1 user:"
 msgid_plural "There are %1 users:"
-msgstr[0] "Existe 1 usuario:"
-msgstr[1] "Existen %1 usuarios:"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-msgstr[0] "Uno de ellos tiene una %1 cuenta"
-msgstr[1] "%2 de ellos tienen una %1 cuenta"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "None of them have a %1 account"
@@ -5198,8 +5029,8 @@ msgstr[1] ""
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] "Uno de ellos está bloqueado"
-msgstr[1] "%1 de ellos está bloqueado"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
@@ -5208,8 +5039,8 @@ msgstr "Ninguno de ellos está bloqueado"
 #: plugins/addons/dashboard/users_accounts.tpl.c:2
 msgid "There is one expired account"
 msgid_plural "There are %1 expired accounts"
-msgstr[0] "Existe una cuenta expirada"
-msgstr[1] "Existen %1 cuentas expiradas"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:5
 msgid "There is no expired account"
@@ -5255,8 +5086,8 @@ msgstr "correo"
 #: plugins/addons/dashboard/users_accounts.tpl.c:35
 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] "Existe una cuenta por expirar en %1 días."
-msgstr[1] "Existen %2 cuentas por exipirar en los siguientes %1 días"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:38
 msgid "There is no account expiring in the next %1 days"
@@ -5296,7 +5127,9 @@ msgstr ""
 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 "Aquí se incluyen todos los permisos ACL de este nodo(s). Si desea la lista de esas asignaciones, por favor presione cancelar y abra los objetos."
+msgstr ""
+"Aquí se incluyen todos los permisos ACL de este nodo(s). Si desea la lista "
+"de esas asignaciones, por favor presione cancelar y abra los objetos."
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 3fdbf78c6f4035ef8405c94b4e3cb609ab0f41d2..7d586d5e2b9a4dbf2428c582ce6b690c92c040b1 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -1,943 +1,867 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Selección de idiomas"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permite seleccionar su idioma preferido"
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nombre de la localización"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de conexión"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Conexión TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN del administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Contraseña de administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Estado actual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuración LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Conectividad LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este dialogo realiza la configuración básica de la conectividad LDAP para "
+"FusionDirectory"
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "¡La conexión como usuario '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Reintento"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La conexión anónima al servidor '%s' ha tenido exito."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Refresco"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "¡Por Favor especifique un usuario y contraseña!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Error de configuración"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completado"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Siguiente"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Terminar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Terminar - Escribir el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Escribir archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"El fichero de configuración es universalmente legible. ¡Por favor modifique "
+"los permisos del archivo!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "En estos momentos la configuración no es accesible o no existe."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
+"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
+"mientras que otros usuarios no deben poder."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Comprobaciones de módulos y extensiones PHP"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Comprobación de la instalación"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Comprobación básica de la versión de PHP y las extensiones."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Comprobando la versión de PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP debe ser versión '%s' o superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor actualize a la versión soportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
+msgstr ""
+"FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory requiere este modulo para una interfaz internacionalizada."
+msgstr ""
+"FusionDirectory requiere este modulo para una interfaz internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory requiere este modulo para comunicarse con distintos tipos de servidores y protocolos."
+msgstr ""
+"FusionDirectory requiere este modulo para comunicarse con distintos tipos de"
+" servidores y protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory requiere este modulo para la integración con Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar encripción SSHA"
+msgstr ""
+"FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
+"encripción SSHA"
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
+msgstr ""
+"FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requiere este modulo para manejar cadenas unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "modulo de compresión"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requiere esta extensión para manejar capturas."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "registr_globals es un mecanismo de PHP para registrar todas las variables globales de tal manera que sean accesible desde scripts sin que cambien su ámbito. Esto puede ser un problema de seguridad."
+msgstr ""
+"registr_globals es un mecanismo de PHP para registrar todas las variables "
+"globales de tal manera que sean accesible desde scripts sin que cambien su "
+"ámbito. Esto puede ser un problema de seguridad."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Busque 'register_globals' en su php.ini y modifíquelo por 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP usa este valor en el recolector de basura para eliminar las sesiones antiguas."
+msgstr ""
+"PHP usa este valor en el recolector de basura para eliminar las sesiones "
+"antiguas."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Ajustando este valor a un día impedirá la perdida de sesiones y cookies antes de que realmente se desconecte por tiempo."
+msgstr ""
+"Ajustando este valor a un día impedirá la perdida de sesiones y cookies "
+"antes de que realmente se desconecte por tiempo."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
+msgstr ""
+"Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Off"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Para poder usar FusionDirectory sin problemas, la opción session.auto_start debe estar configurada en 'Off' en su php.ini."
+msgstr ""
+"Para poder usar FusionDirectory sin problemas, la opción session.auto_start "
+"debe estar configurada en 'Off' en su php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr "Busque 'session.auto_start' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Esta opción está relacionada con el manejo de salida de PHP. Desactive esta opción poniéndola en off para mejorar el rendimiento."
+msgstr ""
+"Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
+"opción poniéndola en off para mejorar el rendimiento."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Busque 'implicit_flush' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
+msgstr ""
+"Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Aumente la seguridad del servidor modificando el parámetro 'expose_php' a 'off'. PHP no debería enviar ningún tipo de información sobre el servidor que esta ejecutando la aplicación."
+msgstr ""
+"Aumente la seguridad del servidor modificando el parámetro 'expose_php' a "
+"'off'. PHP no debería enviar ningún tipo de información sobre el servidor "
+"que esta ejecutando la aplicación."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
+msgstr ""
+"Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenido al asistente de configuración de FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Mensaje de Bienvenida"
+msgstr ""
+"Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analizar el arbol LDAP actual por compatibilidad con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Analizando objetos en la entrada raíz"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Comprobando usuarios invisibles"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Comprobando súper administrador"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Comprobando cuentas fuera del árbol de usuarios"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Objeto '%s' de FusionDirectory faltante!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Por favor compruebe su instalación"
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "No se puede un tipo de objeto estructural en su entrada raíz. Por favor intente añadir la clase de objeto '%s' manualmente."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
+"intente añadir la clase de objeto '%s' manualmente."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Aviso"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están incompletos."
+msgstr ""
+"Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
+"incompletos."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crear"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Roles"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crear"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Error"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios al árbol de usuarios configurado"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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"
+msgstr ""
+"Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nombre de la localización"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de conexión"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Conexión TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN del administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Contraseña de administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Estado actual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuración LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Conectividad LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Este dialogo realiza la configuración básica de la conectividad LDAP para FusionDirectory"
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "¡La conexión como usuario '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Reintento"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La conexión anónima al servidor '%s' ha tenido exito."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Refresco"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "¡Por Favor especifique un usuario y contraseña!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Terminar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Terminar - Escribir el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Escribir archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "El fichero de configuración es universalmente legible. ¡Por favor modifique los permisos del archivo!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "En estos momentos la configuración no es accesible o no existe."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Después de descargar y colocar el archivo en %s, por favor asegúrese de que el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, mientras que otros usuarios no deben poder."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Error de configuración"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Completado"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenido al asistente de configuración de FusionDirectory"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Siguiente"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Mensaje de Bienvenida"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "error interno"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Entrada fallida: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡Se ha indicado un objectType vacio o no válido!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "Sin configurar"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Error del filtro"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "¡El filtro está incompleto!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Permisos"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "No tiene permisos para crear una instantanea para %s."
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "No tiene permisos para recuperar una instantanea para %s."
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Arriba"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Error"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Error fatal"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "en"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "En linea"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Error XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +873,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error en la configuración"
@@ -978,310 +902,304 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
+msgstr ""
+"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Permisos"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Inicio"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Error fatal: no se han definido un emplazamiento para las clases - por favor ejecute '%s' para solucionar esto"
+msgstr ""
+"Error fatal: no se han definido un emplazamiento para las clases - por favor"
+" ejecute '%s' para solucionar esto"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo ejecutando '%s'"
+msgstr ""
+"Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
+"ejecutando '%s'"
+
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Error fatal"
 
-#: include/functions.inc:493
+#: include/functions.inc:475
 #, 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'."
+msgstr ""
+"FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
-msgstr "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los desarrolladores!"
+msgstr ""
+"Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
+"desarrolladores!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte con su Administrador!"
+msgstr ""
+"No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte"
+" con su Administrador!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no debería ocurrir - limpiando referencias multiples."
+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:1121
+#: include/functions.inc:875
 #, 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:1123
+#: include/functions.inc:877
 #, 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"
+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:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Entradas por página"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "No se puede leer el archivo de revisión!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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!"
+msgstr ""
+"No puedo obtener información de esquemas del servidor. ¡No es posible "
+"comprobar los esquemas!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "No se puede asignar un identificador (ID) libre:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "¡método de asignación de id desconocido!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "¡%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "¡sambaUnixIdPool no es único!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "¡No hay ID disponibles!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "¡Excedido el número de intentos máximo!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "¡No se puede asignar un identificador (ID) libre!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
+msgstr ""
+"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
+"solucionarlo"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Por favor solucione el problema y actualize la página."
 
@@ -1290,46 +1208,48 @@ msgstr "Por favor solucione el problema y actualize la página."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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."
+msgstr ""
+"No se puede conectar a LDAP: Por favor consulte con el administrador de "
+"sistemas."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no está activo."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "La funcionalidad de instancias esta activa, pero no se encuentra el módulo de compresión requerido. Por favor instale '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -1352,7 +1272,7 @@ msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de los subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
@@ -1494,7 +1414,8 @@ msgstr "¡El campo '%s' tiene una palabra reservada!"
 #: include/class_msgPool.inc:297
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr "¡El comando especificado como método %s para la extensión '%s' no existe!"
+msgstr ""
+"¡El comando especificado como método %s para la extensión '%s' no existe!"
 
 #: include/class_msgPool.inc:313
 #, php-format
@@ -1601,8 +1522,7 @@ msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1530,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
@@ -1666,255 +1586,270 @@ msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando aquí"
+msgstr ""
+"Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
+"aquí"
 
 #: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, necesita eliminar las caracteristicas %s primero!"
+msgstr ""
+"Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
+"necesita eliminar las caracteristicas %s primero!"
 
 #: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando aquí"
+msgstr ""
+"Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
+"aquí"
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, necesita añadir las caracteristicas %s primero!"
+msgstr ""
+"Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
+"necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Operación de base de datos fallida!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, 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:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe el archivo de configuración!"
+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:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Instale y active el module Pear %s. "
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "No se puede inicializar la clase '%s'! Posiblemente hay un complemento faltante en su instalación de FusionDirectory?"
+msgstr ""
+"No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
+"faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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!"
@@ -1956,7 +1891,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2006,7 +1940,8 @@ msgstr "Argumentos"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "¡La generación de esta página ha provocado errores en el interprete PHP!"
+msgstr ""
+"¡La generación de esta página ha provocado errores en el interprete PHP!"
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
@@ -2020,81 +1955,87 @@ msgstr "Enviar informe de errores"
 msgid "Toggle information"
 msgstr "Modificar información"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +2043,12 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descripción"
@@ -2119,11 +2059,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2102,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2112,154 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "No hay definiciones de extensión para iniciar '%s', por favor compruebe su archivo de configuración."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "El proceso de eliminación ha sido cancelado por la extensión '%s': %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Error del filtro"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "¡El filtro está incompleto!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Error de permisos"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2299,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Enviar"
 
@@ -2343,7 +2309,7 @@ msgstr "Enviar"
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2360,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,11 +2394,15 @@ msgstr "¡Entrada desconocida '%s'!"
 msgid "All users"
 msgstr "Todos los usuarios"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
@@ -2518,45 +2471,44 @@ 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:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
-msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
+msgstr ""
+"Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y recargue esta página antes de iniciar sesión!"
+msgstr ""
+"Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y "
+"recargue esta página antes de iniciar sesión!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
+msgstr ""
+"La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2589,13 +2541,14 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
+msgstr ""
+"Contacte a su administrador, hubo un problema con el servidor de correo"
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2607,7 +2560,9 @@ msgstr "Configuración PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso hasta que esto sea solucionado por un administrador."
+msgstr ""
+"Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso"
+" hasta que esto sea solucionado por un administrador."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2615,7 +2570,8 @@ msgstr "Cambio de contraseña"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
+msgstr ""
+"Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2649,7 +2605,9 @@ msgstr "Error de configuración"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Error fatal: no todas las variables POST fueron transferidas por PHP - por favor informe a su administrador!"
+msgstr ""
+"Error fatal: no todas las variables POST fueron transferidas por PHP - por "
+"favor informe a su administrador!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2662,225 +2620,8 @@ msgstr "¡Bienvenido %s!"
 msgid "References"
 msgstr "Referencias"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Editar parametros de usuarios POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Directorio de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Pertenencia a grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Cuenta"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "El usuario debe introducir la contraseña en el primer inicio de sesión"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Sistema de seguridad"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Modo seguro"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "desactivado"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "Acceso sin restricciones"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "Permitir el acceso a estos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Periodo de gracia activado"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "la contraseña expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "no puede cambiar la contraseña"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2648,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2669,295 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Provincia"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Categoría profesional"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Gestor"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Código Postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
-msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
+msgstr ""
+"La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "La nueva contraseña es demasiado corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -3308,7 +3066,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Atributo de inicio de sesión"
 
@@ -3389,7 +3147,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Saludos,\n\nSu clave ha sido cambiada.\nSu nombre de usuario aun es %s."
+msgstr ""
+"Saludos,\n"
+"\n"
+"Su clave ha sido cambiada.\n"
+"Su nombre de usuario aun es %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3436,526 +3198,459 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
-msgstr "Parámetros de Contraseña"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
-msgstr "Longitud mínima de la contraseña"
-
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activar instantaneas"
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
-msgstr "Usar caducidad de cuenta"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base de instantaneas"
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+msgid "Password settings"
+msgstr "Parámetros de Contraseña"
+
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Mostrar resumen en listados"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
+msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:162
-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."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
+msgstr "Usar caducidad de cuenta"
+
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activar instantaneas"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base de instantaneas"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modo"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
-msgstr "Métodos"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Métodos"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3749,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3878,22 @@ msgstr "Gestión de usuarios"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
@@ -4245,7 +3939,7 @@ msgstr "Eliminar usuario"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3959,7 @@ msgid "Information"
 msgstr "Información"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +3983,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar características posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de seguridad"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo seguro"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desactivado"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acceso sin restricciones"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forzar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Miembros del grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4181,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4677,7 +4358,9 @@ msgstr "Crear una nueva cuenta administrador de FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol LDAP."
+msgstr ""
+"Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol "
+"LDAP."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4692,7 +4375,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos ninguna configuración hasta el momento. Este simple asistente trata de ayudarlo a configurar."
+msgstr ""
+"Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos "
+"ninguna configuración hasta el momento. Este simple asistente trata de "
+"ayudarlo a configurar."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4724,7 +4410,9 @@ msgstr "Encontrar cada posible error de configuración"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Migración asistidas de cualquier configuración LDAP - ¡creando copias de seguridad!"
+msgstr ""
+"Migración asistidas de cualquier configuración LDAP - ¡creando copias de "
+"seguridad!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4745,13 +4433,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr "Añadir las clases de objetos necesarias a la base LDAP"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Actual"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Despues de migrar"
 
@@ -4759,51 +4445,57 @@ msgstr "Despues de migrar"
 msgid "Close"
 msgstr "Cerrar"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Durante la inspección del LDAP vamos a verificar varios problemas comunes "
+"que pueden ocurrir durante la migración a administración por FusionDirectory"
+" de la base LDAP. Puede querer reparar los problemas debajo, para proveer un"
+" servicio mas eficiente."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Comprobar de nuevo"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Si quiere saber que se hará cuando se migren las entradas seleccionadas use el botón 'Mostrar cambios' para ver el LDIF."
+msgstr ""
+"Si quiere saber que se hará cuando se migren las entradas seleccionadas use "
+"el botón 'Mostrar cambios' para ver el LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Mostrar cambios"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Durante la inspección del LDAP vamos a verificar varios problemas comunes que pueden ocurrir durante la migración a administración por FusionDirectory de la base LDAP. Puede querer reparar los problemas debajo, para proveer un servicio mas eficiente."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Comprobar de nuevo"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Crear su fichero de configuración"
@@ -4842,7 +4534,9 @@ msgstr ""
 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 "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'."
+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
@@ -4879,7 +4573,9 @@ msgstr "Su contraseña se ha cambiado correctamente."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Introduzca su dirección de correo actual en el campo debajo y presione el botón 'Cambiar'"
+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
 msgid ""
@@ -4895,7 +4591,9 @@ msgstr "Correo Electrónico"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "La recuperación de claves no está activada. Si ha perdido su clave por favor contacte a su administrador."
+msgstr ""
+"La recuperación de claves no está activada. Si ha perdido su clave por favor"
+" contacte a su administrador."
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4905,7 +4603,9 @@ msgstr "Pantalla de inicio"
 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."
+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
@@ -4930,7 +4630,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y protege al servidor LDAP de tener una mayor carga. La manera mas fácil de manipular grandes bases de datos sin grandes perdidas de tiempo es limitar la búsqueda a valores pequeños y usar filtros para encontrar las entradas que este buscando."
+msgstr ""
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de tener una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la búsqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que este buscando."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4938,13 +4643,17 @@ msgstr "Por favor elija la forma de reaccionar en esta sesión"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignore este error y muestre todas las entradas devueltas por el servidor LDAP"
+msgstr ""
+"ignore este error y muestre todas las entradas devueltas por el servidor "
+"LDAP"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignore este error y muestre todas las entradas que coincidan con el tamaño limite definido y active el uso de filtros en su lugar"
+msgstr ""
+"ignore este error y muestre todas las entradas que coincidan con el tamaño "
+"limite definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4959,12 +4668,16 @@ msgstr ""
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5035,17 +4748,24 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Algunos valores deben ser únicos en el directorio completo mientras que algunas combinaciones no tienen sentido. FusionDirectory muestra los atributos relevantes. Por favor mantenga los valores de abajo para cumplir con las políticas."
+msgstr ""
+"Algunos valores deben ser únicos en el directorio completo mientras que "
+"algunas combinaciones no tienen sentido. FusionDirectory muestra los "
+"atributos relevantes. Por favor mantenga los valores de abajo para cumplir "
+"con las políticas."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
+msgstr ""
+"¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente, puede resultar en errores al pegar el objeto nuevamente!"
+msgstr ""
+"O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente,"
+" puede resultar en errores al pegar el objeto nuevamente!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5153,7 +4873,9 @@ msgstr "No se cambiará su método de hash de la contraseña!"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en todos los programas configurados también."
+msgstr ""
+"Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en"
+" todos los programas configurados también."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index d780663c60df7f8c9b3954aa2cfc3232d8bdf095..bc3240be8d2ddba8c7e96e8a3e14156ca51a10aa 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "خطا"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "خطا"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "خطای داخلی"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "جواز"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "خطا"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "خطا"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "جواز"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "خطا"
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع مشکل دستور '%s' را بزنید."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1972,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2031,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2041,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2400,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2615,7 +2492,8 @@ msgstr "تغییر کلمه عبور"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "اعتبار کلمه عبور شما در حال اتمام است، لطفا کلمه عبور خود را تغییر دهید!"
+msgstr ""
+"اعتبار کلمه عبور شما در حال اتمام است، لطفا کلمه عبور خود را تغییر دهید!"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2662,225 +2540,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2568,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2589,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "اطلاعات شخصی"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "فامیل"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "نام"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "آدرس"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "شماره اتاق."
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "شماره اتاق"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "تلفن"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "تلفن همراه"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "پیجر"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "آدرس پستی منزل"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "شماره تماس خصوصی"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "شماره تلفن منزل"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "اطلاعات سازمان"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "دپارتمان"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "شماره دپارتمان."
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "شماره دپارتمان"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "شماره کارمندی."
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "شماره کارمندی"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "کد پستی"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "کلمه عبور جدید"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2985,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3090,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3664,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3793,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3854,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3874,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3898,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4096,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4341,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4353,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 4fca40e242ba34cd33c95b97b0d6d692112fc3ee..e3fea64f91c20c265e870f8d489ccdb804cdf995 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Varoitus"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Varoitus"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Luo"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Virhe"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Virhe"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Lupa"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Virhe"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Lupa"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr "Peruta"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1972,12 @@ msgstr "Nimi"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Kuvaus"
@@ -2119,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2031,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2041,154 @@ msgstr ""
 msgid "Remove"
 msgstr "Poista"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr "Lataa"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2400,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2539,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2567,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2588,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Etunimi"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Valtio"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Osoite"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Puhelin"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Faksi"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2984,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3089,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Portti"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3663,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3873,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3897,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 6595db70c305311d7ca59f05dbffd1501bdeada6..9982bd2de596617185c593c5013c2c2a3782b598 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -1,946 +1,908 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016-2017
-# MCMic, 2016
-# fusiondirectory <contact@fusiondirectory.org>, 2014
-# MCMic, 2015-2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 20:13+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Configuration de la langue"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
-msgstr "Maintenant vous pouvez choisir la langue par défaut. «Automatique» utilisera la langue demandée par le navigateur. Ce paramètre peut être configuré par utilisateur."
+msgstr ""
+"Maintenant vous pouvez choisir la langue par défaut. «Automatique» utilisera"
+" la langue demandée par le navigateur. Ce paramètre peut être configuré par "
+"utilisateur."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatique"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr "Connexion LDAP"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nom de l'emplacement"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr "Nom de cette connexion à afficher dans la liste des serveurs LDAP"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de connexion"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+"URI pour contacter le serveur LDAP. Commence habituellement par ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Connexion TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+"Est ce que TLS doit être utilisé pour se connecter à ce serveur LDAP ?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "La base de l’annuaire LDAP"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Authentification"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"DN du compte admin à utiliser pour la liaison au LDAP. La base est "
+"automatiquement ajoutée."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN de l'administrateur"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Mot de passe administrateur"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+"Mot de passe pour le compte administrateur à utiliser pour la liaison au "
+"LDAP"
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Statut"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Statut actuel"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+"Résultat de la dernière tentative de liaison LDAP et vérification des "
+"schémas de base"
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuration LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configuration de la connexion LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Cette page permet la configuration de base de l'annuaire LDAP pour "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "La connexion anonyme sur le serveur '%s' à échoué !"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "la connexion comme l'utilisateur '%s' à échoué !"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Réessayer"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La connexion anonyme sur le serveur '%s' à réussi."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Veuillez introduire un utilisateur et un mot de passe !"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "La connexion comme l'utilisateur '%s' au serveur '%s' à réussi !"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+"%s\n"
+"Schema \"%s\": %s"
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Avertissement"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Erreur d'installation"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Terminé"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Suivant"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenue"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Terminé"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Fini - écrire le fichier de configuration"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Ecrire le fichier de configuration"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Votre fichier de configuration est lisible par tout le monde. Veuillez "
+"modifier les permissions !"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Le fichier de configuration ne peut être lu ou n'existe pas."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le"
+" serveur web puisse lire %s. Vous pouvez exécuter les commandes suivantes "
+"pour réaliser cette opération:"
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
-msgstr "Vérification des modules et extensions PHP"
+msgstr "Extension PHP et vérification de celles-ci"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
-msgstr "Configuration de PHP (<a href=\"?info\" target=\"_blank\">montrer les informations)</a>)"
+msgstr ""
+"Configuration de PHP (<a href=\"?info\" target=\"_blank\">montrer les "
+"informations)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Vérification de l'installation"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr "Vérification basique de la version de PHP et des extensions nécessaires."
+msgstr ""
+"Vérification de base de la version de PHP et des extensions nécéssaires."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Vérification de la version de PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP doit être à la version %s ou supérieure."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Veuillez faire la mise à jour vers une version supportée."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory a besoin de ce module pour dialoguer avec votre annuaire LDAP."
+msgstr ""
+"FusionDirectory à besoin de ce module pour dialoguer avec votre annuaire "
+"ldap."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory a besoin de ce module pour afficher l'interface multilingue."
+msgstr ""
+"FusionDirectory à besoin de ce module pour afficher l'interface multilingue."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory a besoin de ce module pour dialoguer avec les différents types de serveurs et de protocoles."
+msgstr ""
+"FusionDirectory à besoin de ce module pour dialoguer avec les différents "
+"types de serveurs et de protocoles."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
-msgstr "FusionDirectory a besoin de ce module pour encoder les variables pour l'utilisation dans du javascript."
+msgstr ""
+"FusionDirectory a besoin de ce module pour encoder les variables pour "
+"l'utilisation dans du javascript."
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
-msgstr "FusionDirectory a besoin de ce module pour filtrer les variables avec un filtre spécifique"
+msgstr ""
+"FusionDirectory a besoin de ce module pour filtrer les variables avec un "
+"filtre spécifique"
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
-msgstr "FusionDirectory a besoin de ce module pour dialoguer avec Samba."
+msgstr "FusionDirectory à besoin de ce module pour dialoguer avec Samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory a besoin du module 'mhash' ou 'sha1' pour l'utilisation du chiffrage SSHA."
+msgstr ""
+"FusionDirectory à besoin du module 'mash' ou 'sha1' pour l'utilisation du "
+"cryptage SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory a besoin de ce module pour dialoguer avec un serveur IMAP."
+msgstr ""
+"FusionDirectory à besoin de ce module pour dialoguer avec un serveur IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr "FusionDirectory a besoin de ce module pour gérer les chaînes de caractère unicode."
+msgstr ""
+"FusionDirectory a besoin  de ce module pour gérer les chaînes de caractère "
+"unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
-msgstr "FusionDirectory a besoin de ce module pour gérer les images."
+msgstr "FusionDirectory a besoin  de ce module pour gérer les images."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "Module de compression"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr "FusionDirectory a besoin de ce module pour gérer les instantanés."
+msgstr ""
+"FusionDirectory a besoin de ce module pour gérer les copie instantanées."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals est un mécanisme PHP pour enregistrer toutes les variables globales afin que les scripts puissent y accéder sans changer la porté des variables. Cela peut constituer un risque de sécurité."
+msgstr ""
+"register_globals est un mécanisme PHP pour enregistrer toutes les variables "
+"globales afin que les scripts puissent y accéder sans changer la porté des "
+"variables. Cela peut constituer un risque de sécurité."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Recherchez l'option 'register_globals' dans votre php.ini et mettez la à 'Off'."
+msgstr ""
+"Recherchez l'option 'register_globals' dans votre php.ini et mettez la à "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP utilise cette variable pour effacer les vieilles sessions."
+msgstr "PHP utilise cette variable pour effacer des anciennes sessions."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Mettre cette valeur à 1 jour permet d'éviter de perde les cookies et les sessions avant qu'elles ne soient réellement expirées."
+msgstr ""
+"Mettre cette valeur à 1 jour permet d'éviter de perde les cookies et les "
+"sessions avant qu'elles soient réellement expirées."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Cherchez 'session.gc_maxlifetime' dans votre php.ini et mettez le à 86400 ou plus."
+msgstr ""
+"Cherchez pour 'session.gc_maxlifetime' dans votre php.ini et mettez le à "
+"86400 ou plus haut."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
-msgstr "Off"
+msgstr "Eteint"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Pour pouvoir utiliser FusionDirectory sans problème, la variable session.auto_start doit être à 'Off' dans votre php.ini."
+msgstr ""
+"Pour pouvoir utiliser FusionDirectory sans problèmes, la variable "
+"session.auto_register doit être à 'Off' dans votre php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Recherchez la variable 'session.auto_start' dans votre php.ini et mettez la à 'Off'."
+msgstr ""
+"Recherchez la variable session.auto_register  et mettez la à 'Off' dans "
+"votre php.ini."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory a besoin au minimum de 128MB de mémoire. Allouer moins causera des erreurs imprévisibles, qui ne seront pas reproductibles ! Augmentez la mémoire pour les installations plus complexes."
+msgstr ""
+"FusionDirectory a besoin au minimum de 128MB de mémoire. Allouer moins que "
+"128MB causera des erreurs imprévisibles, qui ne seront pas reproductibles ! "
+"Augmentez la mémoire pour les installations plus complexes."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Recherchez 'memory_limit' dans votre fichier php.ini votre et mettez le à '128M' ou plus."
+msgstr ""
+"Recherchez 'memory_limit' dans votre fichier php.ini votre et mettez le à "
+"'128M' ou plus haut."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Cette option définit la gestion des sorties, mettez cette option à 'Off' pour améliorer la performance."
+msgstr ""
+"Cette option défini la gestion des sorties, mettez cette option à 'Off', "
+"pour améliorer la performance."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Recherchez 'implicit_flush' dans votre php.ini et mettez le à 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Le temps d'exécution doit être au moins de 30 secondes."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Rechercher l'option 'max_execution_time' dans votre php.ini et mettez la à '30' ou plus."
+msgstr ""
+"Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
+"'30' ou plus."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Augmentez la sécurité de votre serveur en mettant l'option expose_php à 'Off'. PHP n'enverra pas d'information à propos du serveur."
+msgstr ""
+"Augmentez la sécurité de votre serveur en mettant l'option expose_php à "
+"'Off'. PHP n'enverra pas d'information a propos du serveur."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Recherchez 'expose_php' dans votre php.ini et mettez le à 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Améliorez la performance de votre serveur en mettant magic_quotes_gpc à 'off'."
+msgstr ""
+"Améliorez la performance de votre serveur en mettant magic_quotes_gpc à "
+"'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre php.ini et mettez la à 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenue"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenue dans l'assistant de configuration FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Le message d'accueil"
+msgstr ""
+"Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
+"mettez la à 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrer"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
-msgstr "Inspection LDAP"
+msgstr "Vérification de l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
-msgstr "Analyse votre annuaire LDAP pour la compatibilité avec FusionDirectory"
+msgstr ""
+"Analyse de votre annuaire LDAP pour la compatibilité avec FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
-msgstr "Donner tous les droits sur les utilisateurs de cette branche"
+msgstr "Donner tout les droits au utilisateurs sur cette branche"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
-msgstr "Permet aux utilisateurs d'éditer leur propres informations (onglet principal et posix, à n'utiliser que sur la base)"
+msgstr ""
+"Permettre au utilisateurs d'éditer leur propre information (tab générique et"
+" posix, a n'utiliser que sur la base)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
-msgstr "Permet aux utilisateurs de changer leur mot de passe (à n’utiliser que sur la base)"
+msgstr ""
+"Permettre au utilisateurs de changer leur mot de passe (a utiliser que sur "
+"la base)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
-msgstr "Inspection des classes d'objets de l'objet racine"
+msgstr "Inspecter les classes d'objets de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Vérification des permissions sur l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
-msgstr "Recherche d’utilisateurs invisibles"
+msgstr "Vérification des utilisateurs invisibles"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
-msgstr "Vérification du super administrateur"
+msgstr "Vérification du superadministrateur"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Vérification des rôles ACL et groupes par défaut"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
-msgstr "Recherche d'utilisateurs en dehors de la branche utilisateurs"
+msgstr "Vérification d'utilisateurs en dehors de la branche people"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
-msgstr "Recherche de groupes en dehors de la branche groupes"
+msgstr "Vérification des groupes en dehors de la branche groups"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
-msgstr "Recherche de départements invisibles"
+msgstr "Vérification des départements invisibles"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
-msgstr "Recherche d’UID en double"
+msgstr "Vérification pour les uid en double"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr "Recherche de GID en double"
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
-msgstr "La requête LDAP a échoué"
-
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+msgstr "La requête LDAP à é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
 msgid "Possibly the \"root object\" is missing."
 msgstr "L'objet racine est probablement manquant."
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
-msgstr "Échec"
+msgstr "Echec"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Object class FusionDirectory obligatoire '%s' manquante !"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Veuillez vérifier votre installation."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "Impossible de gérer le type structural de votre objet racine. S'il vous plaît essayez d’ajouter la classe d'objet '%s' à la main."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"Impossible de gérer l'objet structural de votre objet racine. S'il vous "
+"plaît essayer de ajouter la classe d'objet '%s' à la main."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr "L'utilisateur \"%s\" n'a pas un accès complet à votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr "L'utilisateur \"%s\" n'a pas un accès complet à votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Avertissement"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "%s utilisateur(s) trouvé(s) qui ne seront pas visibles dans FusionDirectory ou qui sont incomplets."
+msgstr ""
+"J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans ans "
+"FusionDirec."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Migration des utilisateurs"
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Erreur de migration"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Impossible de migrer l'entrée '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Comptes administratifs de FusionDirectory 1.0.7 trouvés : %s"
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Comptes administratifs de FusionDirectory 1.0.7 trouvés : %s"
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr "Vous pouvez exécuter <i>fusiondirectory-setup --migrate-acls</i> après avoir sauvegardé le fichier de configuration à la fin de l'installation pour migrer les acls. <br/>"
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr "Il n’y a pas d'administrateur FusionDirectory 1.0.8 valide dans votre annuaire LDAP."
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Créer"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Groupes"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Rôles"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr "Il n'y a pas d'administrateur FusionDirectory dans votre annuaire LDAP."
+msgstr ""
+"Il n'y a pas d'administrateurs FusionDirectory dans votre annuaire LDAP."
+
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Créer"
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Donner tous les droits sur tous les objets"
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Erreur"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
-msgstr "Les rôles ACL par défaut n'ont pas été insérés"
+msgstr "Les ACL par défaut n'ont pas été insérées"
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
-msgstr "Certains rôles ACL par défaut sont absents"
+msgstr "Certaines ACL par défaut sont manquantes"
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
-msgstr "Les rôles ACL par défaut on été insérés"
+msgstr "Les ACL par défaut on été insérées"
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Impossible d’ajouter un rôle ACL pour '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, 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_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
-msgstr "Déplacer les utilisateurs dans la branche utilisateur configurée"
+msgstr "Bouger les utilisateurs dans la branche utilisateur configurée"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
-msgstr "Impossible de déplacer les utilisateurs vers le département spécifié !"
+msgstr ""
+"Impossible de déplacer les utilisateurs vers le département spécifié !"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "Les entrées seront déplacées depuis"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "vers"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr "%s groupes trouvés en dehors de la branche configurée '%s'."
+msgstr "J'ai trouvé %s groupes en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Déplacer les groupes dans la branche configurée"
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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 dans FusionDirectory."
+msgstr ""
+"J'ai trouvé %s département(s) qui ne seront pas visible dans "
+"FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr "Migration des départements"
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, 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_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr "%s valeurs dupliquées trouvées pour l'attribut \"gidNumber\" : %s"
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr "Connexion LDAP"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nom de l'emplacement"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr "Nom de cette connexion à afficher dans la liste des serveurs LDAP"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de connexion"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI pour contacter le serveur LDAP. Commence habituellement par ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Connexion TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "Est ce que TLS doit être utilisé pour se connecter à ce serveur LDAP ?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "La base de l’annuaire LDAP"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Authentification"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr "DN du compte admin à utiliser pour la liaison au LDAP. La base est automatiquement ajoutée."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN de l'administrateur"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Mot de passe administrateur"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr "Mot de passe pour le compte administrateur à utiliser pour la liaison au LDAP"
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Statut"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Statut actuel"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr "Résultat de la dernière tentative de liaison LDAP et vérification des schémas de base"
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuration LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configuration de la connexion LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Cette page permet la configuration de base de l'annuaire LDAP pour FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "La connexion anonyme sur le serveur '%s' a échoué !"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Connexion de l'utilisateur '%s' échouée !"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Réessayer"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Connexion anonyme sur le serveur '%s' réussie."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Veuillez fournir un utilisateur et un mot de passe !"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Connexion de l'utilisateur '%s' au serveur '%s' réussie !"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr "%s\nSchema \"%s\": %s"
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Fin"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Fin - écrire le fichier de configuration"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Écrire le fichier de configuration"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Votre fichier de configuration est lisible par tout le monde. Veuillez modifier les permissions !"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Le fichier de configuration ne peut être lu ou n'existe pas."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le serveur web puisse lire %s."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Erreur d'installation"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Terminé"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenue à l'assistant de configuration FusionDirectory"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Suivant"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Le message d'accueil"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
-msgstr "Échec de la journalisation : %s"
+msgstr "Echec du Journal système : %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr "Option %s invalide !"
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "Le type d'objet spécifié est vide ou invalide !"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "non configuré"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Erreur de filtre"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Le filtre est incomplet !"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Permission"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Erreur de permission"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "Pas de déclaration d’onglets pour '%s' dans votre fichier de configuration. Impossible d'initialiser le plugin !"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Soumettre"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
-msgstr "Haut"
+msgstr "Au dessus"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
-msgstr "Bas"
+msgstr "En bas"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr "Trier vers le haut"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr "Trier vers le bas"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Sélectionner tout"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Erreur"
+
+#: include/class_listing.inc:569
 msgid "created by"
-msgstr "créé par"
+msgstr "Crée par"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
-msgstr "Aller au département racine"
+msgstr "Aller au département de base"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
-msgstr "Aller au département de l’utilisateur"
+msgstr "Aller au département des utilisateurs"
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Actions"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
-msgstr "Restaurer des instantanés"
+msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
-msgstr "Restaurer l’instantané"
+msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
-msgstr "Créer un instantané"
+msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
-msgstr "Créer un nouvel instantané depuis cet objet"
-
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Erreur fatale"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "dans"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "en ligne"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Erreur XML"
+msgstr "Créer un nouveau snapshot depuis cet objet"
 
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
@@ -951,14 +913,16 @@ msgstr "Impossible de changer le mot de passe, utilisateur '%s' inconnu."
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
-msgstr "Vous devez remplir saslRealm ou saslExop dans l’écran de configuration pour pouvoir utiliser SASL"
-
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+msgstr ""
+"Vous devez remplir saslRealm ou saslExop dans l’écran de configuration pour "
+"pouvoir utiliser SASL"
+
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erreur de configuration"
@@ -969,7 +933,7 @@ msgstr "Page"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr "Pas d'exportation en PDF possible, la bibliothèque FPDF n'est pas installée."
+msgstr "Pas d'exportation en pdf, la librairie FPDF n'est pas installée."
 
 #: include/exporter/class_pdfExporter.inc:196
 msgid "PDF"
@@ -982,360 +946,380 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Le canal demandé n'existe pas ! Veuillez contacter votre administrateur système."
+msgstr ""
+"Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
+"système."
+
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Permissions"
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Tout annuler"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Identifiant"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modèle"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 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"
+msgstr ""
+"modèle d'objet, utilisé pour créer plusieurs objets avec des valeurs "
+"similaires"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Erreur fatale : pas d’emplacement défini pour les classes - veuillez exécuter '%s' pour régler le problème"
+msgstr ""
+"Erreur fatale : pas d'emplacement défini pour les classes  - veuillez "
+"exécuter '%s' pour régler le problème"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter '%s' pour essayer de régler le problème"
+msgstr ""
+"Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
+"'%s' pour essayer de régler le problème"
+
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Erreur Fatale"
 
-#: include/functions.inc:493
+#: include/functions.inc:475
 #, 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'."
+msgstr ""
+"FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu "
+"'%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
-msgstr "Ce login (uid) n'est pas unique au sein de l’annuaire LDAP. Veuillez contacter votre administrateur système."
+msgstr ""
+"Ce login (uid) n'est pas unique au sein de l’annuaire LDAP. Veuillez "
+"contacter votre administrateur système."
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
-msgstr "Il semble que votre mot de passe soit expiré. Veuillez utilisez <a href=\"recovery.php\">la récupération de mot de passe</a> pour le changer."
+msgstr ""
+"Il semble que votre mot de passe soit expiré. Veuillez utilisez <a "
+"href=\"recovery.php\">la récupération de mot de passe</a> pour le changer."
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 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:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. Veuillez contacter votre administrateur !"
+msgstr ""
+"Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
+"Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
-msgstr "Le serveur LDAP a retourné : %s"
+msgstr "Le serveur LDAP à retourné: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Verrou multiple pour un même objet détecté. Ceci ne devrait pas arriver. Effacement des références multiples."
+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:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
-msgstr "La taille limite de %d entrées est dépassée !"
+msgstr "La taille limite de %d entrées est dépassée !"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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 m’afficher ce message si la limite est toujours dépassée"
+msgstr ""
+"Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
+"toujours dépassée"
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Vous êtes sur le point d'éditer l'entrée(s) %s"
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr "Entrées par page"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Appliquer le filtre"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sO"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiO"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiO"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiO"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiO"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiO"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiO"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiO"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiO"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Le fichier '%s' ne peut être supprimé. Essayer de lancer la commande «fusiondirectory-setup --check-directories» sur le serveur FusionDirectory pour corriger les permissions de fichiers."
+msgstr ""
+"Le ficheir '%s' ne peut être supprimé. Essayer de lancer la commande "
+"\"fusiondirectory-setup --check-directories\" sur le serveur FusionDirectory"
+" pour corriger les permissions de fichiers"
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
-msgstr "Impossible d'écrire dans le fichier de révision !"
+msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr "Impossible de lire le fichier de révision !"
 
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' n'est pas disponible. Utilisation de la base par défaut !"
-
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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 !"
+msgstr ""
+"Impossible de récupérer les informations sur les schémas depuis le serveur. "
+"Vérification des schémas impossibles !"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr "schéma principal de FusionDirectory"
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr "Schéma utilisé pour stocker la configuration de FusionDirectory"
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
-msgstr "Utilisé pour stocker l'autorisation de connexion chez les utilisateurs ou les groupes."
+msgstr ""
+"Utilisé pour stocker l'autorisation de connexion chez les utilisateurs ou "
+"les groupes."
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr "Utilisé pour stocker les modèles"
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr "Utilisé pour stocker des informations POSIX."
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Object class obligatoire \"%s\" manquante !"
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Object class facultative \"%s\" manquante !"
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
-msgstr "Vous avez installé le plugin «mixed groups», mais vos schéma ne sont pas compatibles."
+msgstr ""
+"Vous avez installé le plugin «mixed groups», mais vos schéma ne sont pas "
+"compatibles."
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
-msgstr "Pour pouvoir utiliser «mixed groups» l’objectClass «posixGroup» doit être auxiliaire («AUXILIARY»)"
+msgstr ""
+"Pour pouvoir utiliser «mixed groups» l’objectClass «posixGroup» doit être "
+"auxiliaire («AUXILIARY»)"
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
-msgstr "Vos schémas sont fait pour utiliser des «mixed groups», mais ce plugin n’est pas installé."
+msgstr ""
+"Vos schémas sont fait pour utiliser des «mixed groups», mais ce plugin n’est"
+" pas installé."
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Impossible d'allouer un ID libre :"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "Méthode d'allocation des id inconnue !"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax !"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool n'est pas unique !"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "Pas d’ID disponibles !"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "Nombre maximum d'essais dépassé !"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Impossible d'assigner un ID !"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Fichier '%s' non trouvé - veuillez exécuter '%s' pour régler ce problème"
+msgstr ""
+"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
-msgstr "Tous les objets dans cette catégorie"
+msgstr "Tout les objets dans cette catégorie"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
-msgstr "Veuillez corriger l'erreur ci dessus et recharger la page."
+msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
 
 #: include/class_timezone.inc:52
 #, php-format
 msgid "The timezone setting \"%s\" in your configuration is not valid."
-msgstr "Le fuseau horaire '%s' indiqué dans votre configuration est invalide. "
+msgstr ""
+"Le fuseau horaire '%s' indiqué dans votre configuration est invalide. "
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
-msgstr "Erreur XML dans fusiondirectory.conf : %s à la ligne %d"
+msgstr "Erreur XML dans fusiondirectory.conf: %s à la ligne %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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 "Il semble que vous essayez de déchiffrer quelque chose qui n'est pas chiffré :%s<br/>\\nVeuillez vérifier que vous n'utilisez pas un fichier fusiondirectory.secrets alors que vos mots de passe ne sont pas chiffrés."
+msgstr ""
+"Il semble que vous essayez de déchiffrer quelque chose qui n'est pas chiffré"
+" :%s<br/>\\nVeuillez 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:322
+#: include/class_config.inc:313
 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."
+msgstr ""
+"Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
+"l'administrateur du système."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr "La location \"%s\" n'est pas présente dans le fichier de configuration"
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "La fonctionnalité des instantanés est activée, mais la variable requise '%s' n'est pas configurée."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
+"La fonctionnalité des instantanés est activée, mais la variable requise "
+"\"%s\" n'est pas configurée."
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "La fonctionnalité des instantanés est activée, mais le module nécessaire à la compression est manquant. Veuillez installer '%s'. "
+"is missing. Please install \"%s\"."
+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:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Toutes les catégories"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
-msgstr "Mon compte"
+msgstr "Mon Compte"
 
 #: include/class_msgPool.inc:43
 #, php-format
@@ -1350,53 +1334,53 @@ msgstr "Sélectionner pour lister les objets contenant '%s'."
 #: include/class_msgPool.inc:47
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
-msgstr "Sélectionnez pour lister les objets qui ont '%s' activé"
+msgstr "Sélectionnez pour lister les objets qui ont '%s' activés"
 
 #: include/class_msgPool.inc:49
 msgid "Select to search within subtrees"
-msgstr "Sélectionner pour chercher dans les sous arbres"
+msgstr "Sélectionner pour chercher dans le sous arbre"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
-msgstr "Chercher dans les sous arbres"
+msgstr "Chercher dans les sous arbre"
 
 #: include/class_msgPool.inc:67
 msgid "This object will be deleted!"
-msgstr "Cet objet sera supprimé !"
+msgstr "Cet objet sera effacé !"
 
 #: include/class_msgPool.inc:69
 #, php-format
 msgid "This '%s' object will be deleted!"
-msgstr "L'objet '%s' sera supprimé !"
+msgstr "L'objet '%s' sera effacé !"
 
 #: include/class_msgPool.inc:74
 #, php-format
 msgid "This object will be deleted: %s"
-msgstr "Cet objet sera supprimé : %s"
+msgstr "Cet objet sera effacé : %s"
 
 #: include/class_msgPool.inc:76
 #, php-format
 msgid "This '%s' object will be deleted: %s"
-msgstr "L'objet de type '%s' sera supprimé : %s"
+msgstr "L'objet de type '%s' sera effacé: %s"
 
 #: include/class_msgPool.inc:81
 msgid "This object will be deleted:"
-msgstr "Cet objet sera supprimé : "
+msgstr "Cet objet sera effacé: "
 
 #: include/class_msgPool.inc:83
 #, php-format
 msgid "This '%s' object will be deleted:"
-msgstr "L'objet de type '%s' sera supprimé :"
+msgstr "L'objet de type '%s' sera effacé:"
 
 #: include/class_msgPool.inc:87
 #, php-format
 msgid "These objects will be deleted: %s"
-msgstr "Ces objets seront supprimés : %s"
+msgstr "Ces objets seront effacés: %s"
 
 #: include/class_msgPool.inc:89
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
-msgstr "Ces objets de type '%s' seront supprimés : %s"
+msgstr "Ces objets de type '%s' seront effacés: %s"
 
 #: include/class_msgPool.inc:101
 msgid "You have no permission to delete this object!"
@@ -1451,24 +1435,24 @@ msgstr "Vous n'avez pas l'autorisation de voir l'objet :"
 
 #: include/class_msgPool.inc:183
 msgid "You have no permission to view these objects:"
-msgstr "Vous n'avez pas l'autorisation de voir ces objets :"
+msgstr "Vous n'avez pas l'autorisation devoir ces objets :"
 
 #: include/class_msgPool.inc:194
 msgid "You have no permission to move this object!"
-msgstr "Vous n'avez pas l'autorisation de déplacer cet objet !"
+msgstr "Vous n'avez pas l'autorisation de bouger cet objet !"
 
 #: include/class_msgPool.inc:198 include/class_msgPool.inc:202
 msgid "You have no permission to move the object:"
-msgstr "Vous n'avez pas l'autorisation de déplacer l'objet :"
+msgstr "Vous n'avez pas l'autorisation de bouger l'objet :"
 
 #: include/class_msgPool.inc:205
 msgid "You have no permission to move these objects:"
-msgstr "Vous n'avez pas l'autorisation de déplacer ces objets :"
+msgstr "Vous n'avez pas l'autorisation de bouger ces objets :"
 
 #: include/class_msgPool.inc:223 include/class_msgPool.inc:243
 #: include/class_msgPool.inc:273
 msgid "Connection information"
-msgstr "Informations de connexion"
+msgstr "Informations de connexions"
 
 #: include/class_msgPool.inc:225
 #, php-format
@@ -1498,7 +1482,9 @@ msgstr "Le champ '%s' contient un mot réservé !"
 #: include/class_msgPool.inc:297
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr "La commande '%s', spécifiée comme hook du plugin '%s' n'existe pas !"
+msgstr ""
+"La commande '%s', spécifiée comme connexion de l'extension '%s' n'existe pas"
+" !"
 
 #: include/class_msgPool.inc:313
 #, php-format
@@ -1508,42 +1494,43 @@ msgstr "Le commande '%s' est invalide !"
 #: include/class_msgPool.inc:315
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
-msgstr "la commande '%s' pour le plugin %s est invalide !"
+msgstr "l'option '%s' de la commande pour l'extension %s est invalide !"
 
 #: include/class_msgPool.inc:319
 #, php-format
 msgid "'%s' command (%s) is invalid!"
-msgstr "Commande '%s' (%s) invalide !"
+msgstr "l'option '%s' de la commande (%s) est invalide !"
 
 #: include/class_msgPool.inc:321
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "Commande '%s' (%s) pour le plugin %s invalide !"
+msgstr "l'option '%s' de la commande (%s) pour l'extension %s est invalide !"
 
 #: include/class_msgPool.inc:339
 #, php-format
 msgid "Cannot execute '%s' command!"
-msgstr "Impossible d'exécuter la commande '%s' !"
+msgstr "Impossible d'exécuter la commande '%s' !"
 
 #: include/class_msgPool.inc:341
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
-msgstr "Impossible d'exécuter la commande '%s' pour le plugin %s !"
+msgstr ""
+"Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
 
 #: include/class_msgPool.inc:345
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
-msgstr "Impossible d'exécuter la commande '%s' (%s) !"
+msgstr "Impossible d'exécuter l'option '%s' de la commande (%s) !"
 
 #: include/class_msgPool.inc:347
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Impossible d'exécuter la commande '%s' (%s) pour le plugin %s !"
+msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
 
 #: include/class_msgPool.inc:362
 #, php-format
 msgid "Value for '%s' is too large!"
-msgstr "La valeur pour '%s' est trop grande !"
+msgstr "La valeur pour '%s' est trop grande !"
 
 #: include/class_msgPool.inc:364
 #, php-format
@@ -1553,12 +1540,12 @@ msgstr "'%s' doit être plus petit que %s !"
 #: include/class_msgPool.inc:378
 #, php-format
 msgid "Value for '%s' is too small!"
-msgstr "La valeur pour '%s' est trop petite !"
+msgstr "La valeur pour '%s' est trop petite !"
 
 #: include/class_msgPool.inc:380
 #, php-format
 msgid "'%s' must be %d or above!"
-msgstr "'%s' doit être %d ou plus !"
+msgstr "'%s' doit être à la version %d ou plus grand !"
 
 #: include/class_msgPool.inc:393
 #, php-format
@@ -1597,16 +1584,15 @@ msgstr "'%s' n'est pas permis :"
 #: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
-msgstr "'%s' ne sont pas autorisés !"
+msgstr "'%s' n'est pas autorisé !"
 
 #: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
-msgstr "Extension PHP %s manquante !"
+msgstr "Extension PHP %s manquante !"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1614,7 +1600,7 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Appliquer"
@@ -1649,12 +1635,12 @@ msgstr "Supprimer %s"
 #: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
-msgstr "Éditer..."
+msgstr "Editer..."
 
 #: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
-msgstr "Éditer %s..."
+msgstr "Editer %s..."
 
 #: include/class_msgPool.inc:540
 msgid "Back"
@@ -1663,265 +1649,286 @@ msgstr "Retour"
 #: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
-msgstr "Ce compte n'a pas d'extensions %s valides !"
+msgstr "Ce compte n'a pas d'extensions %s valides !"
 
 #: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Ce compte a l’onglet %s activé. Vous pouvez le désactiver en cliquant sur le bouton ci-dessous."
+msgstr ""
+"Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
+"cliquant sur le bouton ci-dessous."
 
 #: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Ce compte a l’onglet %s activé. Pour le désactiver vous devez au préalable désactiver l’onglet %s !"
+msgstr ""
+"Ce compte possède les paramètres %s activés. Pour les désactiver vous devez "
+"au préalable supprimer les paramètres %s !"
 
 #: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Ce compte a l’onglet %s désactivé. Vous pouvez l’activer en cliquant ci dessous."
+msgstr ""
+"Ce compte possède les paramètres %s desactivés. Vous pouvez les activer en "
+"cliquant ci dessous."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Ce compte a l’onglet %s désactivé. Pour l’activer, vous devez au préalable activer l’onglet %s !"
+msgstr ""
+"Ce compte possède les paramètres %s désactivés. Pour les activer, vous devez"
+" au préalable ajouter les paramètres %s !"
+
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Ajouter les paramètres %s"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
-msgstr "Retirer les paramètres %s"
+msgstr "Effacer les paramètres %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 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 boite de dialogue"
+msgstr ""
+"Cliquez sur le bouton 'Éditer' ci-dessous pour changer les informations dans"
+" cette boite de dialogue"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Janvier"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Février"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Mars"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Avril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Juin"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Juillet"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Août"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octobre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Décembre"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Samedi"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "L’opération sur la base de données a échouée !"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lecture"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "ajout"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modification"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "suppression"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "recherche"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "authentification"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
-msgstr "L’opération '%s' LDAP a échoué !"
+msgstr "La requête LDAP %s à échoué !"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
-msgstr "La requête LDAP a échoué !"
+msgstr "La requête LDAP à échoué !"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objet"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
-msgstr "Le téléchargement a échoué !"
+msgstr "Le téléchargement à échoué !"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
-msgstr "Le téléchargement a échoué : %s"
+msgstr "Le téléchargement à échoué : %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Erreur de communication avec le service d'infrastructure !"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
-msgstr "Erreur de communication avec le service d'infrastructure : %s"
+msgstr "Erreur de communication avec le service d'infrastructure : %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
-msgstr "Ce '%s' est en cours d'utilisation par : %s"
+msgstr "Ce '%s' est en cours d'utilisation par : %s"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
-msgstr "Ce '%s' est toujours en cours d’utilisation."
+msgstr "Ce '%s' est toujours en utilisation."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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"
+msgstr "Ce '%s' est en utilisation par les objets : %s"
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
-msgstr "Le fichier '%s' n'existe pas !"
+msgstr "Le fichier '%s' n'existe pas !"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
-msgstr "Impossible d’ouvrir le fichier '%s' en lecture !"
+msgstr "Impossible de lire le fichier '%s' !"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
-msgstr "Impossible d'ouvrir le fichier '%s' en écriture !"
+msgstr "Impossible d'écrire dans le fichier '%s' !"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "La valeur de '%s' est actuellement vide ou invalide, veuillez vérifier votre fichier de configuration !"
+msgstr ""
+"La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier "
+"votre fichier de configuration !"
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
-msgstr "Impossible de supprimer le fichier '%s' !"
+msgstr "Impossible d'effacer le fichier '%s' !"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
-msgstr "Impossible de créer le répertoire '%s' !"
+msgstr "Impossible de créer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
-msgstr "Impossible de supprimer le répertoire '%s' !"
+msgstr "Impossible d'effacer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support pour %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installer et activer le module PHP %s."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installer et activer le module Pear %s."
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Impossible d’initialiser la classe '%s' ! Peut-être manque-t-il un plugin dans votre installation de FusionDirectory ?"
+msgstr ""
+"Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
+"extension dans votre installation de FusionDirectory ?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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 !"
+msgstr ""
+"La base fournie n'est pas valide et à été réinitialisée à la valeur "
+"précédente !"
 
 #: include/class_SnapshotDialogs.inc:30
 msgid "Creating an object snapshot"
@@ -1933,7 +1940,7 @@ msgstr "DN de l’objet dont vous créez un instantané"
 
 #: include/class_SnapshotDialogs.inc:37
 msgid "Timestamp"
-msgstr "Horodatage"
+msgstr "Date"
 
 #: include/class_SnapshotDialogs.inc:37
 msgid "Timestamp of this snapshot creation"
@@ -1960,9 +1967,8 @@ msgid "Restoring snapshots"
 msgstr "Restauration d’instantanés"
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
-msgstr "Instantanés"
+msgstr "Copie instantanée"
 
 #: include/class_SnapshotDialogs.inc:186
 msgid "Existing snapshots for this object"
@@ -2010,7 +2016,9 @@ msgstr "Arguments"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "La création de cette page a occasionné des erreurs d'après l'interpréteur PHP !"
+msgstr ""
+"La création de cette page à occasionné des erreurs d'après l'interpréteur "
+"PHP !"
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
@@ -2024,69 +2032,90 @@ msgstr "Envoyer un rapport de bug"
 msgid "Toggle information"
 msgstr "Afficher/Cacher l'information"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Avertissement de performance"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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 !"
+msgstr ""
+"La performance de votre annuaire est faible : la dernière requête à duré "
+"%.2fs !"
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 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' : object class non trouvée !"
+msgstr ""
+"Impossible de créer automatiquement des sous-arbres avec le RDN '%s' : "
+"object class non trouvée !"
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
-msgstr "Impossible de créer automatiquement des sous-arbres avec le RDN '%s' : non supporté"
+msgstr ""
+"Impossible de créer automatiquement des sous-arbres avec le RDN '%s' : non "
+"supporté"
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
-msgstr "proc_open a échoué lors de l’exécution de ldapsearch"
+msgstr "proc_open à échoue lors de l’exécution de ldapsearch"
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, 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"
+msgstr ""
+"Erreur ligne %s, la première ligne d'une entrée ne peut pas commencer par un"
+" espace"
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, 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."
+msgstr ""
+"Erreur ligne %s, les références à un fichier externe ne sont pas prises en "
+"charge."
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, 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:1163
+#: include/class_ldap.inc:1076
 #, 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:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr "Erreur ligne %s, une d'entrée doit commencer par le dn"
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, 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 !"
+msgstr ""
+"Erreur lors de l'importation du dn : \"%s\", veuillez vérifier votre fichier"
+" LDIF à partir de la ligne %s !"
+
+#: include/class_templateHandling.inc:474
+#, 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 ""
+"Dépendance récursive dans les champs de modèle: \"%1$s\" ne peut pas "
+"dépendre de \"%2$s\" vu que  \"%2$s\" dépend déjà \"%1$s\""
 
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
@@ -2094,11 +2123,10 @@ 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2106,13 +2134,12 @@ msgstr "Nom"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Description"
@@ -2123,18 +2150,20 @@ msgid "POSIX group %s"
 msgstr "Groupe POSIX %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Rôle %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Groupe %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:465
 msgid "Group of user"
-msgstr "Groupe de l’utilisateur"
+msgstr "Groupe d'utilisateurs"
 
 #: include/simpleplugin/class_dialogAttributes.inc:634
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
@@ -2158,14 +2187,14 @@ msgstr "Inconnu"
 #: plugins/admin/groups/group-list.xml:119
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 msgid "Edit"
-msgstr "Éditer"
+msgstr "Editer"
 
 #: include/simpleplugin/class_dialogAttributes.inc:655
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2174,130 +2203,162 @@ msgstr "Éditer"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "Pas de définition de plugin pour l'initialisation de '%s', veuillez vérifier votre fichier de configuration."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "L'effacement a été interrompu par le plugin '%s': %s"
+msgstr ""
+"Pas de définition de plugin pour l'initialisation de \"%s\", veuillez "
+"vérifier votre fichier de configuration."
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr "Déplacer de \"%s\" à \"%s\" a échoué"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "O"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "secondes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minutes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "heures"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "jours"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Depuis un modèle"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "%s modèle"
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
-msgstr "Afficher les '%s'"
+msgstr "Afficher %s"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Erreur de Filtre"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Le filtre est incomplet !"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Erreur de permissions"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+"Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
 
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
-msgstr "SANS TITRE"
+msgstr "Pas de titre"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr "Paramètres du modèle"
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Le nom de ce modèle "
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr "Seulement l'onglet principal peut générer un dn"
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, 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:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
-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:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Erreur lors de la sauvegarde"
+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:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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"
+msgstr "Il existe déjà une entrée avec le même dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "L'entrée %s n'existe pas"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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 "L'objet a changé depuis son ouverture dans FusionDirectory. Toutes les modifications qui peuvent être faites par d'autres seront perdus si vous enregistrez cette entrée!"
+msgstr ""
+"L'objet a changé depuis son ouverture dans FusionDirectory. Toutes les "
+"modifications qui peuvent être faites par d'autres seront perdus si vous "
+"enregistrez cette entrée!"
+
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr "Service \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Onglet \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1039
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Champ inconnu \"%s\""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2310,22 +2371,24 @@ msgstr "Base de l'objet"
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:137
 #, 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\" est pas dans la liste des choix possibles"
+msgstr ""
+"La valeur \"%s\" pour le champ \"%s\" est pas dans la liste des choix "
+"possibles"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Impossible de lire le fichier importé : '%s'"
+msgstr "Impossible de lire le fichier importé : '%s'"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 msgid "file is empty"
-msgstr "Le fichier est vide"
+msgstr "le fichier est vide."
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 msgid "file not found"
-msgstr "fichier non trouvé"
+msgstr "le fichier n'a pas été trouvé"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 msgid "file not readable"
@@ -2334,24 +2397,26 @@ msgstr "le fichier n'est pas lisible"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:72
 #, php-format
 msgid "%s (%d bytes)"
-msgstr "%s (%d octets)"
+msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
-msgstr "Téléverser"
+msgstr "Télécharger"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:124
 #: include/simpleplugin/attributes/class_FileAttribute.inc:125
 msgid "Download"
-msgstr "Télécharger"
+msgstr "Téléchargement"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
-msgstr "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que la bibliothèque php \"imagick\" soit installée pour cela."
+msgstr ""
+"Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que"
+" la bibliothèque php \"imagick\" soit installée pour cela."
 
 #: include/simpleplugin/attributes/class_SetAttribute.inc:136
 #, php-format
@@ -2361,7 +2426,7 @@ msgstr "La valeur du champ multivalué \"%s\" n'est pas un tableau"
 #: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
-msgstr "Valeur invalide pour %s"
+msgstr "Valeur invalide: %s"
 
 #: include/simpleplugin/attributes/class_DateAttribute.inc:131
 #, php-format
@@ -2376,48 +2441,32 @@ msgstr "Un nombre entier entre %d et %d"
 #: include/simpleplugin/attributes/class_IntAttribute.inc:52
 #, php-format
 msgid "An integer larger than %d"
-msgstr "Un nombre entier supérieur à %d"
+msgstr "Un nombre entier plus grande %d"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:54
 #, php-format
 msgid "An integer smaller than %d"
-msgstr "Un nombre entier inférieur à %d"
+msgstr "Un entier plus petit que %d"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:156
 #, php-format
 msgid "A float between %f and %f"
-msgstr "Un nombre à virgule entre %f et %f"
+msgstr "Un nombre a virgule flottant entre %f et %f"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:158
 #, php-format
 msgid "A float larger than %f"
-msgstr "Un nombre à virgule supérieur à %f"
+msgstr "Un nombre a virgule flottant plus grand que %f"
 
 #: include/simpleplugin/attributes/class_IntAttribute.inc:160
 #, php-format
 msgid "A float smaller than %f"
-msgstr "Un nombre à virgule inférieur à %f"
+msgstr "Un nombre a virgule flottant plus petit que %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 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_plugin.inc:809
-#, 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 "Dépendance récursive dans les champs de modèle: \"%1$s\" ne peut pas dépendre de \"%2$s\" vu que  \"%2$s\" dépend déjà \"%1$s\""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr "Service \"%s\""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Onglet \"%s\""
+msgstr ""
+"Il y a eu un problème lors de la décompression de la copie instantanée"
 
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
@@ -2425,7 +2474,7 @@ msgstr "ACL"
 
 #: include/class_acl.inc:36
 msgid "Manage access control lists"
-msgstr "Gère les listes de contrôle d'accès (ACL)"
+msgstr "Gestion de listes de contrôle d'accès (ACL)"
 
 #: include/class_acl.inc:39
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:34
@@ -2437,26 +2486,34 @@ msgstr "Rôles ACL"
 msgid ""
 "Unkown ACL type '%s'!\n"
 "You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
-msgstr "Type d'ACL inconnu '%s'!\nVous devez exécuter \"fusiondirectory-setup --migrate-acls\" pour migrer vos acls au nouveau format."
+msgstr ""
+"Type d'ACL inconnu '%s'!\n"
+"Vous devez exécuter \"fusiondirectory-setup --migrate-acls\" pour migrer vos acls au nouveau format."
 
 #: include/class_acl.inc:170
 #, php-format
 msgid "Unknown entry '%s'!"
-msgstr "Entrée inconnue '%s' !"
+msgstr "Entrée inconnue '%s'  !"
 
 #: include/class_acl.inc:173
 #, php-format
 msgid "All users"
-msgstr "Tous les utilisateurs"
+msgstr "Tout les utilisateurs"
+
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Appliquer le filtre"
 
-#: html/setup.php:59
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Le répertoire '%s' spécifié comme répertoire de compilation est inaccessible !"
+msgstr ""
+"Le répertoire '%s' spécifié comme répertoire de compilation est inaccessible"
+" !"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2467,14 +2524,18 @@ msgstr "Attention: <a href=%s\"> La session n'est pas chiffrée !<a>"
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
-msgstr "Attention: La durée de validité des sessions configurée dans votre fusiondirectory.conf sera remplacée par celle définie dans votre php.ini."
+msgstr ""
+"Attention: La durée de validité des sessions configurée dans votre "
+"fusiondirectory.conf sera remplacée par celle définie dans votre php.ini."
 
 #: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. Veuillez exécuter fusiondirectory-setup --check-config."
+msgstr ""
+"Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
+"Veuillez exécuter fusiondirectory-setup --check-config."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2483,11 +2544,13 @@ msgstr "Erreur Smarty"
 #: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
-msgstr "Le répertoire \"%s\" spécifié comme répertoire de compilation est inaccessible !"
+msgstr ""
+"Le répertoire \"%s\" spécifié comme répertoire de compilation est "
+"inaccessible !"
 
 #: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
-msgstr "Votre session FusionDirectory a expiré !"
+msgstr "Votre session FusionDirectory à expiré !"
 
 #: html/index.php:211
 msgid "Your IP has changed!"
@@ -2508,59 +2571,60 @@ msgstr "La vérification des schémas LDAP a signalé des erreurs :"
 
 #: html/index.php:255
 msgid "LDAP schema error"
-msgstr "La vérification des schémas LDAP a signalé des erreurs :"
+msgstr "Erreur de schéma LDAP"
 
 #: html/index.php:282
 msgid "Please specify a valid username!"
-msgstr "Veuillez indiquer un nom d’utilisateur valide !"
+msgstr "Le nom d'utilisateur est incorrect !"
 
 #: html/index.php:285
 msgid "Please specify your password!"
-msgstr "Veuillez introduire votre mot de passe !"
+msgstr "Veuillez introduire votre mot de passe !"
 
 #: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
-msgstr "Compte verrouillé. Veuillez contacter votre administrateur système !"
+msgstr "Compte verouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Aucune valeur trouvée dans l'entête HTTP \"%s\""
 
-#: html/index.php:476
+#: html/index.php:470
 #, 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 "
+msgstr ""
+"L'utilisateur \"%s\" mentionné dans l’entête n'existe pas dans l'annuaire "
+"LDAP "
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
-msgstr "L'utilisateur \"%s\" mentionné dans l’entête correspond à plusieurs personnes  dans l'annuaire LDAP "
+msgid "Login with user \"%s\" triggered error: %s"
+msgstr "La connexion avec l'utilisateur \"%s\" à déclenché l'erreur : \"%s\""
 
-#: html/index.php:548
+#: html/index.php:537
 #, 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:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr "L'utilisateur CAS \"%s\" correspond à plusieurs personnes  dans l'annuaire LDAP "
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Votre navigateur a les cookies désactivés. Veuillez activer les cookies et recharger cette page avant de vous connecter !"
+msgstr ""
+"Votre navigateur à les cookies désactivées. Veuillez activer les cookies et "
+"recharger cette page avant de vous connecter !"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. Abandon."
+msgstr ""
+"Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
+"Abandon."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2574,7 +2638,7 @@ msgstr "Aucun compte utilisateur trouvé avec l'identifiant \"%s\""
 #: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
-msgstr "Plusieurs comptes trouvés avec l’identifiant \"%s\""
+msgstr "Plusieurs comptes trouvés avec le login \"%s\""
 
 #: html/class_passwordRecovery.inc:507
 #, php-format
@@ -2589,19 +2653,25 @@ msgstr "Il y a plusieurs comptes qui utilisent le courriel \"%s\""
 #: html/class_passwordRecovery.inc:518
 #, 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 !"
+msgstr ""
+"L'utilisateur correspondant au courriel \"%s\" est verrouillé. Veuillez "
+"contacter votre administrateur système !"
 
 #: html/class_passwordRecovery.inc:573
 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"
+msgstr ""
+"Contactez votre administrateur système, il y a eu un problème avec l'envoi "
+"du message"
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
-msgstr "Le jeton n'est pas valide"
+msgstr "Le token n'est pas valable"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
-msgstr "Un problème est survenu avec le serveur, le courriel de confirmation n'a pas été envoyé"
+msgstr ""
+"Un problème est survenu avec le serveur de messagerie, le mail de "
+"confirmation n'a pas été envoyé"
 
 #: html/main.php:115
 msgid "PHP configuration"
@@ -2611,7 +2681,10 @@ msgstr "Configuration de PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Erreur fatale : «Register globals» est activé. FusionDirectory ne permettra pas aux utilisateurs de se connecter tant que ceci n'est pas corrigé par un administrateur."
+msgstr ""
+"FATAL: Register globals est activé. FusionDirectory ne permettra pas aux "
+"utilisateurs de se connecter tant que ceci n'est pas corrigé par un "
+"administrateur."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2619,7 +2692,8 @@ msgstr "Changement de mot de passe"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
+msgstr ""
+"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2627,7 +2701,7 @@ msgstr "Votre mot de passe a expiré, veuillez changer votre mot de passe."
 
 #: html/main.php:208
 msgid "Running out of memory!"
-msgstr "Plus de mémoire disponible !"
+msgstr "Plus de mémoire disponible !"
 
 #: html/main.php:251
 msgid "User ACL checks disabled"
@@ -2635,14 +2709,16 @@ msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
 
 #: html/main.php:289
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Extension"
 
 #: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
-msgstr "Erreur Fatale : Impossible de trouver une définition pour le plugin '%s' ! ('%s' n'est pas un fichier) !"
+msgstr ""
+"Erreur Fatale : Impossible de trouver une définition pour le plugin '%s' ! "
+"('%s' n'est pas un fichier)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
@@ -2653,7 +2729,9 @@ msgstr "Erreur de configuration"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Erreur fatale : toutes les variables POST n’ont pas été transférées par PHP - veuillez avertir votre administrateur !"
+msgstr ""
+"FATAL: toutes les variables POST non pas été transférées par PHP - Veuillez "
+"avertir votre administrateur !"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2666,225 +2744,8 @@ msgstr "Bienvenue %s !"
 msgid "References"
 msgstr "Références"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Éditer les paramètres POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Répertoire Home"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Chemin du répertoire \"home\" de cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Shell à utiliser lors de la connexion de l’utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Groupe principal"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Groupe principal de cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Statut du compte unix de l'utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Forcer l’id d’utilisateur/groupe"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Force les valeurs des ids d’utilisateur et de groupe pour cet utilisateur."
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "Id d’utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Id d’utilisateur à utiliser pour cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "Id de groupe"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Id de groupe à utiliser pour cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Appartenance aux groupes"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Compte"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "L'utilisateur doit changer son mot de passe lors de sa première connexion"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "L'utilisateur doit changer son mot de passe lors de la première connexion (il est nécessaire de remplir le champ «Délai»)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr "Délai minimum entre les changements de mot de passe (jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr "L'utilisateur ne sera pas habilité à changer son mot de passe avant ce nombre de jour (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Délai avant de forcer le changement de mot de passe (en jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "L'utilisateur sera forcé de changer son mot de passe après ce nombre de jours (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Date d'expiration du mot de passe"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Date après laquelle le mot de passe de l'utilisateur va expirer (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Délai d'inactivité avant de désactiver l'utilisateur (en jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Délai maximum d'inactivité après l'expiration du mot de passe avant que l'utilisateur soit désactivé (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Délai d'avertissement de l'utilisateur avant l'expiration de son mot de passe (en jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "L'utilisateur sera averti à partir de ce nombre de jours restant avant l'expiration de son mot de passe (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Système de confiance"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Mode de confiance"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Type d'autorisation pour ces hôtes"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "désactivé"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "accès complet"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "permettre l'accès a ces hôtes"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Autoriser cet utilisateur à se connecter uniquement sur cette liste d’hôtes"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automatique"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "expiré"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "temps de grâce actif"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "actif"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "mot de passe expiré"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "mot de passe non modifiable"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Le temps d'attente du verrou a été dépassé. Verrou ignoré !"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Groupe de l'utilisateur %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Groupes et rôles"
 
@@ -2904,14 +2765,14 @@ msgstr "Appartenance aux rôles"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password method"
-msgstr "Chiffrement des mots de passe"
+msgstr "Format de stockage des mots de passe"
 
 #: plugins/personal/generic/class_user.inc:46
 msgid "Password hash method to use"
-msgstr "Méthode de chiffrement des mots de passe"
+msgstr "Format de stockage des mots de passe"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2922,7 +2783,7 @@ msgstr "Mot de passe"
 
 #: plugins/personal/generic/class_user.inc:51
 msgid "Password (Leave empty if you do not wish to change it)"
-msgstr "Mot de passe (Laissez vide si vous ne voulez pas changer)"
+msgstr "Mot de passe (Laisser vide si vous ne voulez pas changer)"
 
 #: plugins/personal/generic/class_user.inc:55
 msgid "Password again"
@@ -2932,280 +2793,306 @@ msgstr "Mot de passe (de nouveau)"
 msgid "Same password as above, to avoid errors"
 msgstr "Veuillez réintroduire le mot de passe pour éviter les erreurs"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Information du compte utilisateur"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Compte utilisateur"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr "Statut de verrouillage de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
-msgstr "Nom de famille de cet utilisateur"
+msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
-msgstr "Prénom de cet utilisateur"
+msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
-msgstr "Courte description de l'utilisateur"
+msgstr "Une courte description de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Photo"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "L'avatar pour cet utilisateur"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Information de contact organisationnelles"
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
-msgstr "État"
+msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Adresse postale professionnelle"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
-msgstr "No. de bureau"
+msgstr "No. de bureau."
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Téléphone"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Numéro de téléphone professionnel"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
-msgstr "Mobile"
+msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
-msgstr "Numéro de mobile professionnel "
+msgstr "Numéro de GSM professionnel "
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Numéro de bip professionnel"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Numéro de fax professionnel"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
-msgstr "Site web"
+msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Site web personnel"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Compte utilisateur"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Identifiant de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Mot de passe de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
-msgstr "Informations de contact personnelles"
+msgstr "Informations personnelles"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nom à afficher"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 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."
+msgstr ""
+"Nom de l'utilisateur tel qu'il devrait apparaître. Utilisé par le carnet "
+"d'adresse Exchange."
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Adresse postale"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
-msgstr "Informations organisationnelles"
+msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titre"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
-msgstr "Titre d'une personne dans leur contexte organisationnel. Chaque titre est une valeur de cet attribut multivalué"
+msgstr ""
+"Titre d'une personne dans leur contexte organisationnel. Chaque titre est "
+"une valeur de cet attribut multivalué"
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
-msgstr "Organisme"
+msgstr "Entreprise"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:428
+#: 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:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
-msgstr "Numéro du département"
+msgstr "No. du département."
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
-msgstr "No. de l'employé"
+msgstr "No. de l'employé."
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
-msgstr "Type d'employé"
+msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Responsable"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr "Rue"
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr "Nom de la rue"
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr "Boîte postale"
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Code postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, 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:614
+#: plugins/personal/generic/class_user.inc:662
 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:625
+#: plugins/personal/generic/class_user.inc:673
 #, 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"
+msgstr ""
+"Vous devez attendre %d secondes avant de changer votre mot de passe à "
+"nouveau"
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 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:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 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:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
-msgstr "Les mots de passe entrés dans les champs 'Nouveau mot de passe' et celui dans le champ 'Répéter le nouveau mot de passe' ne concordent pas."
+msgstr ""
+"Les mots de passe entrés dans les champs 'Nouveau mot de passe' et celui "
+"dans le champ 'Répéter le nouveau mot de passe' ne concordent pas."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr "Le nouveau mot de passe est trop court."
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
-msgstr "Le mot de passe contient probablement des caractères Unicode qui sont problématique"
+msgstr ""
+"Le mot de passe contient probablement des caractères Unicode qui sont "
+"problématique"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:28
 msgid "Statistics about users"
@@ -3277,11 +3164,11 @@ msgstr "Activer ou non la fonctionnalité de récupération de mot de passe"
 
 #: plugins/config/class_recoveryConfig.inc:51
 msgid "Sender email address"
-msgstr "Adresse de courriel de l'émetteur"
+msgstr "Adresse de messagerie de l'émetteur"
 
 #: plugins/config/class_recoveryConfig.inc:52
 msgid "Email address from which mails will be sent"
-msgstr "Adresse de courriel de laquelle les messages seront envoyés"
+msgstr "Adresse de messagerie avec laquelle les messages seront envoyés"
 
 #: plugins/config/class_recoveryConfig.inc:58
 msgid "Link validity (minutes)"
@@ -3299,7 +3186,9 @@ msgstr "Chaine de caractères aléatoires pour les jetons"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Ceci est juste une mesure de sécurité, vous pouvez mettre ce que vous voulez ici, même des caractères au hasard"
+msgstr ""
+"Ceci est juste une mesure de sécurité, vous pouvez mettre ce que vous voulez"
+" ici, même des caractères au hasard"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3309,17 +3198,21 @@ msgstr "Autoriser des adresses de messagerie alternatives"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Les utilisateurs pourront entrer une adresse de messagerie alternative pour récupérer leur mot de passe"
+msgstr ""
+"Les utilisateurs pourront entre une adresse de messagerie alternative pour "
+"récupérer leur mot de passe"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Attribut de connexion"
 
 #: plugins/config/class_recoveryConfig.inc:78
 msgid ""
 "Usually uid, but you can use something else for instance in case of SSO"
-msgstr "Habituellement uid, mais vous pouvez utiliser quelque chose d'autre par exemple dans le cas d'utilisation d'un SSO"
+msgstr ""
+"Habituellement uid, mais vous pouvez utiliser quelque chose d'autre par "
+"exemple dans le cas d'utilisation d'un SSO"
 
 #: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
@@ -3336,19 +3229,22 @@ msgstr "Sujet du premier message"
 
 #: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
-msgstr "[FusionDirectory] Lien de réinitialisation du mot de passe"
+msgstr "[FusionDirectory] lien de reinitialisation du mot de passe"
 
 #: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
-msgstr "Corps du message (le premier %s est l'identifiant, le second est le lien)"
+msgstr ""
+"Corps du message (le premier %s est l'identifiant, le second est le lien)"
 
 #: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 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 "Corps du premier message, envoyé lorsque l'utilisateur demande un nouveau mot de passe. Utilisez %s pour l'identifiant et le lien de récupération."
+msgstr ""
+"Corps du premier message, envoyé lorsque l'utilisateur demande un nouveau "
+"mot de passe. Utilisez %s pour l'identifiant et le lien de récupération."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3360,7 +3256,14 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr "Bonjour,\n\nVoici vos informations :\n- Identifiant : %s\n- Lien : %s\n\nCeci est seulement valide pour 10 minutes"
+msgstr ""
+"Bonjour,\n"
+"\n"
+"Voici vos informations :\n"
+"- Identifiant : %s\n"
+"- Lien : %s\n"
+"\n"
+"Ceci est seulement valide pour 10 minutes"
 
 #: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
@@ -3372,7 +3275,7 @@ msgstr "Sujet du second message"
 
 #: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
-msgstr "[FusionDirectory] Réinitialisation du mot de passe réussie !"
+msgstr "[FusionDirectory] Réinitialisation du mot de passe réussi !"
 
 #: plugins/config/class_recoveryConfig.inc:114
 #, php-format
@@ -3384,7 +3287,9 @@ msgstr "Corps du message (%s est l'identifiant)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Corps du second message, envoyé pour confirmer que le mot de passe a été changé. Utilisez %s pour l’identifiant de l'utilisateur."
+msgstr ""
+"Corps du second message, envoyé pour confirmer le mot de passe a été changé."
+" Utilisez %s pour l'indentifiant de l'utilisateur."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3393,7 +3298,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Bonjour,\n\nVotre mot de passe a été changé. \nVotre identifiant de connexion est toujours %s."
+msgstr ""
+"Hello,\n"
+"\n"
+"Votre mot de passe à été changé. \n"
+"Vos identifiants de connexion sont toujours %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3421,7 +3330,10 @@ msgstr "Langue"
 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 "Langue de l’application. Automatique utilisera la langue demandée par le navigateur. Ce paramètre peut être configuré par utilisateur."
+msgstr ""
+"Maintenant vous pouvez choisir la langue par défaut. Automatique utilisera "
+"la langue demandée par le navigateur. Ce paramètre peut être configuré par "
+"utilisateur."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3440,527 +3352,503 @@ msgid "Timezone to be used"
 msgstr "Fuseau horaire à utiliser"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Installation des schémas"
+msgid "Core settings"
+msgstr "Paramétrage de base"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "nombre maximal d'objet LDAP retournés"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr "Définit le nombre maximal d'objets LDAP recupérés par défaut"
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Édition du verrouillage"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Vérifie si une entrée en cours d'édition a été modifié par une application "
+"autre que FusionDirectory dans le même temps"
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Activer la journalisation"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Activer la journalisation coté FusionDirectory"
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr "Validation des schémas"
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
-msgstr "Activer la validation des schémas lors de la connexion"
+msgstr "Activer la validation des schéma lors de la connexion"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activer la copie instantanée"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Cela vous permet de sauver certaines entrées et de les restaurer plus tard"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base pour les snapshots"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+"Branche LDAP à l'intérieur de laquelle les copies instantanés d'objets "
+"seront stockés"
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
-msgstr "Préférences des mots de passe"
+msgstr "Préférences pour les mots de passe"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
-msgstr "Méthode de chiffrement par défaut des mots de passe"
+msgstr "Méthode de hachage des mots de passe par défaut"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
-msgstr "Méthode de chiffrement à utiliser par défaut"
+msgstr "Méthode de hachage à utiliser par défaut"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
-msgstr "Forcer la méthode de chiffrement par défaut"
+msgstr "Forcer la méthode de hachage par défaut"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
-msgstr "Forcer l'utilisation de la méthode de chiffrement des mots de passe par défaut "
+msgstr ""
+"Forcer l'utilisation de la méthode de hachage des mots de passe par défaut "
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
-msgstr "Longueur minimum des mots de passe"
+msgstr "Taille minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Longueur minimum des mots de passe utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Différence minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 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"
+msgstr "Nombre de caractères différents par rapport au précédent mot de passe"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
-msgstr "Activer l'expiration de compte"
+msgstr "Utiliser l'expiration du compte"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
-msgstr "Activation des tests sur les attributs cachés durant la connexion à FusionDirectory et force le renouvellement du mot de passe ou bloque le compte"
-
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
-msgstr "Royaume SASL"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr "Opération Extérieur SASL"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr "Attribut à stocker dans l'attribut 'userPassword'"
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Paramétrage de base"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Afficher les sommaires dans les listes"
-
-#: plugins/config/class_configInLdap.inc:162
-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 "Détermine si une barre d'état sera affichée en bas des listes pour indiquer les nombres et types des objets affichés"
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Verrouillage de l’édition"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Vérifie si une entrée en cours d'édition a été modifiée par une application autre que FusionDirectory dans le même temps"
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Activer la journalisation"
+msgstr ""
+"Activation des tests sur les attributs cachés durant la connexion à "
+"FusionDirectory et renouvellement forcé des mots de passe ou blocage du "
+"compte"
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Activer la journalisation coté FusionDirectory."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
+msgstr "Royaume pour la connexion SASL"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Limite de taille LDAP"
+msgid "SASL Exop"
+msgstr "Opération Extérieur SASL"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Définit le nombre maximal d'objets LDAP retournés par défaut."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr "Attribut à stocker dans l'attribut 'userPassword'"
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
-msgstr "Connexion et session"
+msgstr "connexion et session"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
-msgstr "Attribut LDAP utilisé comme identifiant lors de la connexion"
+msgstr ""
+"Attribut LDAP utilisé comme identifiant de connexion lors de la connexion"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
-msgstr "Forcer les connexions chiffrées"
+msgstr "Force les connexions cryptées"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Activer les vérifications PHP de sécurité pour forcer HTTPS lors de l’accès à l'interface web."
+msgstr ""
+"Activer les vérifications PHP de sécurité pour activer HTTPS lors de l’accès"
+" à l'interface web"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
-msgstr "Avertir si la session ne sera pas chiffrée"
+msgstr "Avertir si la session ne sera pas cryptée"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 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."
+msgstr ""
+"Affiche un avertissement pour indiquer l'usage du protocole HTTP au lieu de "
+"HTTPS"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Durée de vie de la session"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr "Définit la durée d'une session en secondes (0 pour désactiver)."
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr "Authentification HTTP de base"
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 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."
+msgstr ""
+"Utiliser le protocole d'authentification Basic HTTP au lieu du formulaire de"
+" connexion."
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr "authentification entêtes HTTP"
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
-msgstr "Utiliser d'authentification par entêtes HTTP au lieu du formulaire de connexion."
+msgstr ""
+"Utiliser d'authentification par entêtes HTTP au lieu du formulaire de "
+"connexion."
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr "Nom de l’entête"
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr "Nom de l'en-tête contenant l'identification utilisateur."
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activer les instantanés"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Cela vous permet de sauver l’état de certaines entrées et de les restaurer plus tard"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base pour les instantanés"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "Branche LDAP dans laquelle les instantanés seront stockés."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Clé privée"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
-msgstr "Chemin vers la clef privée de FusionDirectory. Inutilisé actuellement."
+msgstr ""
+"Chemin vers la clef privée de FusionDirectory. Inutilisé actuellement."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Chemin du certificat"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
-msgstr "Chemin vers le certificat public de FusionDirectory. Inutilisé actuellement."
+msgstr ""
+"Chemin vers le certificat public de FusionDirectory. Inutilisé actuellement."
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Chemin du certificat CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 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."
+msgstr ""
+"Chemin d'accès au CA public. Utilisé pour valider l'hôte du serveur "
+"Argonaut."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Activer CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "CAS sera utilisé à la place de la connexion LDAP"
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 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:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Hôte"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr "Hôte du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr "Port d’écoute du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr "Contexte CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr "Contexte CAS à utiliser"
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
-msgstr "Stockage des utilisateurs et groupes"
+msgstr ""
+"Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
-msgstr "Attribut pour le DN des utilisateurs"
+msgstr "Type d'attribut pour le DN des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attribut à utiliser pour le début du DN utilisateur"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Modèle CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr "Le modèle à utiliser pour construire le common name"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Règles de de nommage strictes"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Active la vérification stricte des noms d’utilisateur et de groupe"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Id minimum de groupe/utilisateur"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr "L’id d’utilisateur ou de groupe minimum assignable pour éviter des risques de sécurité avec des id égales à 0."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Hook de nouvel id"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr "Un script à appeler pour trouver le prochain id libre pour les utilisateurs et groupes."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Départ pour les ids d’utilisateur"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Où commencer à chercher pour un nouvel id d’utilisateur libre."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Départ pour les ids de groupe"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Point de départ pour rechercher un id de groupe libre"
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
-msgstr "Branche des utilisateurs"
+msgstr "Chemin relatif des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Branche où sont stockés les utilisateurs."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
-msgstr "Branche des groupes"
+msgstr "Chemin relatif des groupes"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
-msgstr "Branche où sont stockés les groupes."
+msgstr "Branche où sont stockés les groupes"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Branche des rôles ACL"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
-msgstr "Branche où sont stockés les rôles ACL."
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Méthode d’allocation des ids"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Méthode pour allouer les ids d’utilisateur et de groupe"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Traditionnel"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Réservoir d’ids Samba"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Minimum des ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Valeur minimum pour les ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Maximum des ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Valeur maximum pour les ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Minimum des ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Valeur minimum pour les ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Maximum des ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Valeur maximum pour les ids de groupe du réservoir"
+msgstr "Branche où sont stockés les ACL"
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Restreindre les membres du rôle"
 
-#: plugins/config/class_configInLdap.inc:377
+#: 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 "Lorsqu'elle est activée uniquement les utilisateurs de la même branche ou les membres des groupes de la même branche peut être ajouté à un rôle."
+msgstr ""
+"Lorsqu'elle est activée uniquement les utilisateurs de la même branche ou "
+"les membres des groupes de la même branche peut être ajouté à un rôle."
+
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr "Champs d'adresse séparés"
+
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
+"Exposez les champs Street, PostOfficeBox et postalCode au lieu de "
+"PostalAddress."
+
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
+msgstr "Modèle d'adresse postale"
+
+#: plugins/config/class_configInLdap.inc:321
+msgid ""
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
+msgstr ""
+"Lorsque vous utilisez des champs d'adresse distincts, vous pouvez utiliser "
+"un motif pour remplir le champ PostalAddress."
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
-msgstr "Débogage"
+msgstr "Deboguage"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Afficher les erreurs"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "Afficher les erreurs PHP en haut de l'écran. Cela doit être désactiver en environnement de production car des mots de passe peuvent être affichés."
+msgstr ""
+"Afficher les erreurs dans la partie haute de l'écran. Cela sera a désactiver"
+" en environnement de production car des mots de passe peuvent être affichés."
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Arrêter les opérations LDAP si aucune réponse n'est obtenue dans un délai spécifié en secondes."
+msgstr ""
+"Arrêter les opérations LDAP si aucunes réponses n'est obtenue dans un délai "
+"spécifié"
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
-msgstr "Journaliser les statistiques LDAP"
+msgstr "Inscrit les statistique de l'annuaire LDAP dans les journaux systèmes"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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 "Stocker les statistiques LDAP via syslog. Cela aide à trouver les problèmes d'indexation et de mauvais filtres de recherche."
+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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Niveau de débogage"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
-msgstr "Afficher certaines informations à chaque chargement de page."
+msgstr "Afficher certaines informations sur chaque chargement de page."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Afficher les sommaires dans les listes"
+
+#: 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 ""
+"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:368
+msgid "Show ACL tab on all objects"
+msgstr "Montrer l’onglet ACL sur tous les objets"
+
+#: 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 ""
+"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:374
+msgid "Available department categories"
+msgstr "Liste des catégories de département"
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr "Les catégories disponibles dans le menu déroulant départements"
+
+#: 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:385
+msgid "Group or role"
+msgstr "Groupes ou rôles"
+
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
+msgstr "Plugin à mettre en liste noire"
+
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
+msgstr "Liste noire du menu des plugins"
+
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Connexions"
+
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks that are called when specific actions happens"
-msgstr "Hooks appelés quand des actions spécifiques surviennent"
+msgstr "Déclencheurs appelés en fonction de l’exécution d’actions spécifiques"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "onglet"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
+msgstr "Onglet"
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
-msgstr "Onglet concerné pas ce hook"
+msgstr "Onglet concerné pas ce déclencheur"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "mode"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Mode"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Quand appeler cette commande"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
+msgstr "Commande"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Commande qui sera appelée"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Hooks"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Montrer le résultat du hook"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
-msgstr "Si activé, après réussite du hook, sa sortie textuelle est affichée dans une fenêtre à l'utilisateur."
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Shells disponibles"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Shells POSIX disponibles pour les utilisateurs de FusionDirectory"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr "Shell par défaut"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr "Shell utilisé par défaut lors de l'activation du tab Unix."
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Afficher l’onglet ACL sur tous les objets"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-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:472
-msgid "Available department categories"
-msgstr "Liste des catégories de département"
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr "Les catégories disponibles dans le menu déroulant départements"
+msgstr ""
+"Si activé, après réussite de du hook, le résultat est affiche dans une "
+"fenêtre à l'utilisateur"
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
@@ -3984,11 +3872,11 @@ msgstr "Groupes d'objets"
 
 #: plugins/config/class_mainPluginsConfig.inc:45
 msgid "OGroup RDN"
-msgstr "Branche des groupes d'objets"
+msgstr "Chemin relatif des groupes d'objets"
 
 #: plugins/config/class_mainPluginsConfig.inc:45
 msgid "Branch in which object groups will be stored"
-msgstr "Branche où seront stockés les groupes d'objets"
+msgstr "Branches ou seront stockés les groupes d'objets"
 
 #: plugins/config/class_mainPluginsConfig.inc:52
 msgid "SASL"
@@ -4002,7 +3890,9 @@ msgstr "Forcer la demande de mot de passe"
 msgid ""
 "Useful if you add a hook using password value when SASL user passwords are "
 "edited"
-msgstr "Utile si vous ajoutez un hook utilisant le mot de passe et que la méthode utilisée est SASL"
+msgstr ""
+"Utile si vous ajoutez un hook utilisant le mot de passe et que la méthode "
+"utilisée est SASL"
 
 #: plugins/config/class_dashBoardConfig.inc:28
 msgid "Dashboard configuration"
@@ -4044,7 +3934,9 @@ msgstr "Nombre de jours"
 msgid ""
 "Number of days before expiration needed for an account to show in the "
 "dashboard next expired accounts list"
-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"
+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/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
@@ -4058,9 +3950,8 @@ msgstr "département"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4074,12 +3965,12 @@ msgstr "Nom de %s"
 #: plugins/admin/departments/class_department.inc:67
 #, php-format
 msgid "A name for this %s"
-msgstr "Un nom pour ce %s"
+msgstr "Un nom pour %s"
 
 #: plugins/admin/departments/class_department.inc:72
 #, php-format
 msgid "Short description of this %s"
-msgstr "Une courte description de ce %s"
+msgstr "Une courte description de %s"
 
 #: plugins/admin/departments/class_department.inc:76
 msgid "Category"
@@ -4088,7 +3979,7 @@ msgstr "Catégorie"
 #: plugins/admin/departments/class_department.inc:76
 #, php-format
 msgid "Category of this %s"
-msgstr "Catégorie de ce %s"
+msgstr "Catégorie de %s"
 
 #: plugins/admin/departments/class_department.inc:80
 msgid "Website"
@@ -4102,7 +3993,7 @@ msgstr "Site Web de %s"
 #: plugins/admin/departments/class_department.inc:84
 #, php-format
 msgid "Manager of this %s"
-msgstr "Responsable de ce %s"
+msgstr "Manager de %s"
 
 #: plugins/admin/departments/class_department.inc:99
 #: plugins/admin/departments/class_country.inc:29
@@ -4114,7 +4005,7 @@ msgstr "Pays"
 #: plugins/admin/departments/class_department.inc:102
 #, php-format
 msgid "A postal address for this %s"
-msgstr "Adresse postale pour ce %s"
+msgstr "Adresse postale pour %s"
 
 #: plugins/admin/departments/class_department.inc:106
 msgid "Telephone number"
@@ -4126,7 +4017,7 @@ msgstr "Numéro de fax"
 
 #: plugins/admin/departments/class_organization.inc:51
 msgid "organization"
-msgstr "organisme"
+msgstr "Entreprise"
 
 #: plugins/admin/departments/class_domain.inc:30
 #: plugins/admin/departments/class_domain.inc:31
@@ -4136,7 +4027,7 @@ msgstr "Domaine"
 
 #: plugins/admin/departments/class_domain.inc:51
 msgid "domain"
-msgstr "domaine"
+msgstr "Domaine"
 
 #: plugins/admin/departments/class_departmentManagement.inc:35
 msgid "Manage departments"
@@ -4146,7 +4037,9 @@ msgstr "Gérer les départements"
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
-msgstr "Gérer les départements, pays, composants de domaine, les domaines, les localités et les nœuds des organisations"
+msgstr ""
+"Gérer les départements, pays, composants de domaine, les domaines, les "
+"localités et les nœuds des organisations"
 
 #: plugins/admin/departments/class_departmentManagement.inc:38
 msgid "Users and groups"
@@ -4156,11 +4049,11 @@ msgstr "Utilisateurs et groupes"
 #: plugins/admin/departments/class_dcObject.inc:31
 #: plugins/admin/departments/class_dcObject.inc:34
 msgid "Domain Component"
-msgstr "Composant de domaine"
+msgstr "Objet Domaine"
 
 #: plugins/admin/departments/class_dcObject.inc:51
 msgid "domain component"
-msgstr "composant de domaine"
+msgstr "Composant domaine"
 
 #: plugins/admin/departments/class_locality.inc:30
 #: plugins/admin/departments/class_locality.inc:31
@@ -4170,7 +4063,7 @@ msgstr "Lieu"
 
 #: plugins/admin/departments/class_locality.inc:51
 msgid "locality"
-msgstr "lieu"
+msgstr "Lieu"
 
 #: plugins/admin/departments/dep-list.xml:9
 msgid "List of departments"
@@ -4178,7 +4071,7 @@ msgstr "Liste des départements"
 
 #: plugins/admin/departments/class_country.inc:50
 msgid "country"
-msgstr "pays"
+msgstr "Pays"
 
 #: plugins/admin/users/class_userManagement.inc:43
 msgid "Manage users"
@@ -4188,24 +4081,26 @@ 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:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
-msgstr "La méthode \"%s\" ne permet pas le verrouillage du mot de passe. Le compte \"%s\" n'a pas été verrouillé !"
+msgstr ""
+"La méthode \"%s\" ne permet pas le verrouillage du mot de passe. Le compte "
+"\"%s\" n'a pas été verrouillé !"
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
-msgstr "Verrouiller le compte"
+msgstr "Verrouiller Compte"
 
 #: plugins/admin/users/user-list.xml:11
 msgid "List of users"
@@ -4221,7 +4116,7 @@ msgstr "Prénom"
 
 #: plugins/admin/users/user-list.xml:127
 msgid "Lock users"
-msgstr "Verrouiller les utilisateurs"
+msgstr "Verouillez les utilisateurs"
 
 #: plugins/admin/users/user-list.xml:135
 msgid "Unlock users"
@@ -4237,7 +4132,7 @@ msgstr "Créer un nouvel utilisateur depuis un modèle"
 
 #: plugins/admin/users/user-list.xml:189
 msgid "Edit user"
-msgstr "Éditer l’utilisateur"
+msgstr "Editer cet utilisateur"
 
 #: plugins/admin/users/user-list.xml:198
 msgid "%{filter:lockLabel(userPassword)}"
@@ -4245,11 +4140,11 @@ msgstr "%{filter:lockLabel(userPassword)}"
 
 #: plugins/admin/users/user-list.xml:212
 msgid "Remove user"
-msgstr "Supprimer l'utilisateur"
+msgstr "Suppression de l'utilisateur"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4269,8 +4164,7 @@ msgid "Information"
 msgstr "Information"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Nom du groupe"
 
@@ -4294,164 +4188,158 @@ msgstr "Les membres du rôle"
 msgid "Add users for the role"
 msgstr "Ajouter des utilisateurs au rôle"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
-msgstr "Gérer les groupes et les rôles"
+msgstr "Gérer les groupes et rôles"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr "Permet de gérer des groupes d'objets, des groupes POSIX et des rôles "
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Éditer les propriétés du role"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Modifier les propriétés posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Afficher les groupes utilisateurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Afficher les groupes principaux"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
-msgstr "Afficher les rôles organisationnels "
+msgstr "Montrer les rôles organisationnels "
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Afficher les groupes d’applications"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr "Afficher des groupes non identifiés"
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Groupes principaux"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
-msgstr "Afficher les groupes de courriel"
+msgstr "Groupes de messagerie"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
-msgstr "Afficher les groupes Samba"
+msgstr "Groupes Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr "Afficher les entrées DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Afficher les groupes de serveurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Afficher les groupes de stations de travail"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Afficher les groupes de stations Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Afficher les groupes de terminaux"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Afficher les groupes d’imprimantes"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Afficher les groupes de téléphones"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
-msgstr "Type Inconnu : %s"
+msgstr "Entrée inconnue:  '%s' "
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
-msgstr "Dn inexistant : %s"
+msgstr "le dn n'existe pas : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
-msgstr "Groupe d'objet"
+msgstr "Groupes d'objets"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Information du groupe d’objets"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
-msgstr "Groupe"
+msgstr "Groupes"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Description courte pour ce groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objets membres"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objets membres de ce groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr "Autoriser ce groupe à se connecter uniquement sur cette liste d'hôtes"
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr "Mettre les stations de travail et les terminaux dans le même groupe est interdit"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Système de Confiance"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Liste des groupes"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Mode de confiance"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "Information du groupe POSIX"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Type d'autorisation pour ces hôtes"
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "Groupe POSIX"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "désactivé"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr "Groupe d’utilisateurs POSIX"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "accès complet"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forcer le GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "permettre l'accès a ces hôtes"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "Forcer la valeur du GID pour ce groupe"
+#: plugins/admin/groups/class_ogroup.inc:226
+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_group.inc:73
-msgid "GID value for this group"
-msgstr "GID de ce groupe"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
+msgstr ""
+"Mettre les stations de travail et les terminaux dans le même groupe est "
+"interdit"
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Membres du groupe"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Liste des groupes"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4477,7 +4365,7 @@ msgstr "Impossible de trouver le dn demande dans l'annuaire LDAP"
 
 #: plugins/admin/acl/class_aclManagement.inc:139
 msgid "ACL assignments"
-msgstr "Affectations ACL"
+msgstr "Gestion des ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments management"
@@ -4490,7 +4378,7 @@ msgstr "Affectations des rôles ACL pour les utilisateurs"
 #: plugins/admin/acl/class_aclManagement.inc:209
 #: plugins/admin/acl/class_aclAssignment.inc:273
 msgid "ACL Assignment"
-msgstr "Affectation ACL"
+msgstr "Gestion des ACL"
 
 #: plugins/admin/acl/class_aclAssignment.inc:26
 msgid "ACL Assignment Dialog"
@@ -4500,13 +4388,11 @@ msgstr "Boite de dialogue d’affectation ACL"
 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
-msgid "Mode"
-msgstr "Mode"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
-msgstr "Est-ce que cela doit être appliqué au sous arbre complet ou seulement la base ?"
+msgstr ""
+"Est-ce que cela doit être appliqué a la sous-arborescence complète ou "
+"seulement la base?"
 
 #: plugins/admin/acl/class_aclAssignment.inc:44
 msgid "Subtree"
@@ -4522,11 +4408,11 @@ msgstr "Rôle à appliquer"
 
 #: plugins/admin/acl/class_aclAssignment.inc:52
 msgid "For all users"
-msgstr "Tous les utilisateurs"
+msgstr "Tout les utilisateurs"
 
 #: plugins/admin/acl/class_aclAssignment.inc:52
 msgid "Apply this ACL for all LDAP users"
-msgstr "Appliquer cette ACL pour tous les utilisateurs LDAP"
+msgstr "Appliquer cette ACL pour tout les utilisateurs LDAP"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 #: ihtml/themes/breezy/acl.tpl.c:32
@@ -4535,7 +4421,7 @@ msgstr "Membres"
 
 #: plugins/admin/acl/class_aclAssignment.inc:56
 msgid "Users or groups to assign this role to."
-msgstr "Utilisateurs et groupes à qui appliquer ce rôle"
+msgstr "Utilisateurs et rôles à qui appliquer cette ACL"
 
 #: plugins/admin/acl/class_aclAssignment.inc:190
 #, php-format
@@ -4544,24 +4430,24 @@ msgstr ", et %d autres"
 
 #: plugins/admin/acl/class_aclAssignment.inc:259
 msgid "ACL assignment"
-msgstr "Affectation ACL"
+msgstr "Gestion des ACL"
 
 #: plugins/admin/acl/class_aclAssignment.inc:274
 msgid "Access control roles assignment"
-msgstr "Affectation des rôles de contrôle d’accès"
+msgstr "Gestion des listes de contrôle d’accès"
 
 #: plugins/admin/acl/class_aclAssignment.inc:293
 msgid "Assignments"
-msgstr "Affectations"
+msgstr "Affectation"
 
 #: plugins/admin/acl/class_aclAssignment.inc:297
 msgid "ACL role assignments for this base"
-msgstr "Affectations des rôles ACL pour cette base"
+msgstr "Affectation des rôles ACL pour cette base"
 
 #: plugins/admin/acl/class_aclAssignment.inc:308
 #, php-format
 msgid "Assignments on object or subtree %s"
-msgstr "Affectations sur l'objet ou la branche %s"
+msgstr "Affectation sur l'objet ou la branche %s"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:186
 msgid "No ACL settings for this category"
@@ -4570,11 +4456,11 @@ msgstr "Pas d'ACL pour cette catégorie"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:188
 #, php-format
 msgid "ACL for these objects: %s"
-msgstr "ACL pour ces objets : %s"
+msgstr "ACL pour ces objets: %s"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 msgid "Edit category ACL"
-msgstr "Éditer les catégories ACL"
+msgstr "Editer les catégories ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 msgid "Reset category ACL"
@@ -4583,11 +4469,11 @@ msgstr "Remettre à zéro les catégories ACL"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:202
 #: ihtml/themes/breezy/acl.tpl.c:41
 msgid "List of available ACL categories"
-msgstr "Liste des catégories d'ACL disponibles"
+msgstr "Liste des catégories d'acl disponibles"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:215
 msgid "All objects in current subtree"
-msgstr "Tous les objets dans le sous arbre actuel"
+msgstr "Tout les objets dans le sous arbres actuel"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:217
 #, php-format
@@ -4610,27 +4496,27 @@ msgstr "Afficher/Cacher la configuration avancée"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:349
 msgid "Create objects"
-msgstr "Créer des objets"
+msgstr "Créer un objet"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:350
 msgid "Move objects"
-msgstr "Déplacer des objets"
+msgstr "Bouger un objet"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:351
 msgid "Remove objects"
-msgstr "Supprimer des objets"
+msgstr "Enlever les objets"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:353
 msgid "Grant permission to owner"
-msgstr "Donner la permission au propriétaire"
+msgstr "Donner la permission à l'utilisateur"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:362
 msgid "Complete object"
-msgstr "L'objet complet"
+msgstr "L'objet au complet"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:35
 msgid "ACL roles management"
-msgstr "Gestion des rôles ACL"
+msgstr "Gestion des rôles"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:36
 msgid "Manage ACL roles"
@@ -4639,7 +4525,7 @@ msgstr "Gérer les rôles ACL"
 #: plugins/admin/aclrole/class_aclRole.inc:38
 #, php-format
 msgid "Contains settings for these objects: %s"
-msgstr "Contient les paramètres pour ces objets : %s"
+msgstr "Contient les paramètres pour ces objets: %s"
 
 #: plugins/admin/aclrole/class_aclRole.inc:78
 msgid "Access control roles"
@@ -4647,11 +4533,11 @@ msgstr "Contrôle d'accès (ACL)"
 
 #: plugins/admin/aclrole/class_aclRole.inc:81
 msgid "ACL role"
-msgstr "Rôle ACL"
+msgstr "Rôles ACL"
 
 #: plugins/admin/aclrole/class_aclRole.inc:99
 msgid "A name for this role"
-msgstr "Un nom pour ce rôle"
+msgstr "Nom du rôle "
 
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Short description of this role"
@@ -4667,7 +4553,7 @@ msgstr "ACLs qui font partie de ce groupe"
 
 #: setup/setup_checks.tpl.c:11
 msgid "FusionDirectory will NOT run without fixing this."
-msgstr "FusionDirectory ne fonctionnera PAS si vous ne corrigez pas cela."
+msgstr "FusionDirectory ne fonctionnera pas si vous ne corrigez pas cela."
 
 #: setup/setup_checks.tpl.c:14
 msgid "FusionDirectory will run without fixing this."
@@ -4681,11 +4567,13 @@ msgstr "Créer un nouveau compte administrateur pour FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Ce dialogue vas automatiquement créer un nouveau super utilisateur dans votre arbre LDAP."
+msgstr ""
+"Ce dialogue vas automatiquement créer un nouveau super utilisateur dans "
+"votre arbre LDAP."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
-msgstr "ID de l’utilisateur"
+msgstr "ID de l'utilisateur"
 
 #: setup/setup_migrate_adminAccount.tpl.c:17
 msgid "Password (again)"
@@ -4696,39 +4584,44 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Il semble que c'est votre première utilisation de FusionDirectory - nous n'avons pas trouvé de configuration. Ce programme d'aide à l'installation vous aidera à configurer FusionDirectory."
+msgstr ""
+"Il semble que c'est votre première installation de FusionDirectory - nous "
+"n'avons pas trouvé de configuration. Ce programme d'aide à l'installation "
+"vous aidera à configurer FusionDirectory."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
-msgstr "Qu’est ce que le programme d'aide à l’installation fera pour vous ?"
+msgstr "Qu'est ce que le programme d'aide à l'installation fera pour vous ?"
 
 #: setup/setup_welcome.tpl.c:8
 msgid "Create a basic, single site configuration"
-msgstr "Créer une simple configuration mono-site"
+msgstr "Créer une simple configuration mono site"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr "Essayer de trouver s’il existe des problèmes dans votre configuration PHP ou LDAP"
+msgstr ""
+"Essaye de trouver si il existe des problèmes dans votre configuration PHP ou"
+" LDAP"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr "Vous permettre de régler un ensemble d’options de base et avancées"
+msgstr "Vous permet de choisir un jeu d'option de base ou avancées"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
-msgstr "Assister la migration d’un annuaire LDAP existant"
+msgstr "Migration assistée d'un annuaire LDAP existant"
 
 #: setup/setup_welcome.tpl.c:20
 msgid "What will the wizard NOT do for you?"
-msgstr "Qu’est-ce que l’assistant d’installation ne fera PAS pour vous ?"
+msgstr "Qu'est ce que le l'assistant d'installation ne fera pas pour vous ?"
 
 #: setup/setup_welcome.tpl.c:23
 msgid "Find every possible configuration error"
-msgstr "Trouver toutes les erreurs de configuration possibles"
+msgstr "Trouver toutes les erreur possible dans votre configuration"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Migrer toutes les situations LDAP possibles − faites des sauvegardes !"
+msgstr "Migrer tout les scénario LDAP possible - créez des sauvegardes !"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4739,23 +4632,24 @@ msgid ""
 "For security reasons you need to authenticate for the installation by "
 "creating the file '%1', containing the current session ID on the servers "
 "local filesystem. This can be done by executing the following command:"
-msgstr "Pour des raisons de sécurité vous devez vous authentifier en créant le fichier '%1', contenant l'ID de la session sur le serveur. Ceci peut être réalisé en exécutant la commande suivante :"
+msgstr ""
+"Pour des raisons de sécurité vous devez vous authentifier en créant le "
+"fichier '%1', contenant l'ID de la session sur le(s) serveur(s). Ceci peut "
+"être réalisé en exécutant la commande suivante:"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
-msgstr "Cliquez sur 'Continuer' quand vous avez fini."
+msgstr "Cliquer sur 'Continuer' quand vous avez fini."
 
 #: setup/setup_migrate_baseOC.tpl.c:2
 msgid "Add required object classes to the LDAP base"
-msgstr "Ajouter les Object class obligatoires à la base LDAP"
+msgstr "Ajouter les Object class obligatoires a l'annuaire LDAP. "
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Actuel"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Après migration"
 
@@ -4763,58 +4657,76 @@ msgstr "Après migration"
 msgid "Close"
 msgstr "Fermer"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Pendant l'inspection LDAP, nous allons regarder pour les problèmes "
+"classiques qui peuvent arriver lorsque l'on migre vers une administration "
+"basée sur FusionDirectory. Vous pouvez fixer les problèmes si dessous afin "
+"de procurer une administration facilitée."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Vérifier à nouveau"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
-msgstr "Ce dialogue permet de déplacer un ensemble d'entrées dans l’annuaire configuré. Exécuter cette opération peut améliorer votre service LDAP."
+msgstr ""
+"Ce dialogue permet de déplacer un ensemble d'entrées dans l’annuaire "
+"configuré. Exécuter cette opération peut améliorer votre service LDAP."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
-msgstr "Soyez prudent avec cette opération ! Il peut exister des références qui pointent vers ces entrées. Le programme d’installation de FusionDirectory ne peut pas migrer ces références, vous préférerez peut-être annuler la migration dans ce cas."
+msgstr ""
+"Soyez prudent avec cette opération ! Il peut exister des références qui "
+"pointent vers ces entrées. Le programme d’installation de FusionDirectory ne"
+" peut pas migrer ces références, vous préférerez peut-être annuler la "
+"migration dans ce cas."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Déplacer les entrées sélectionnées "
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
-msgstr "Les entrées listées sont actuellement invisibles dans l’interface de FusionDirectory. Si vous voulez changer ceci pour certaines entrées, veuillez les sélectionner et utiliser le bouton 'Migrer' ci-dessous."
+msgstr ""
+"Les entrées listées sont actuellement invisibles dans l’interface de "
+"FusionDirectory. Si vous voulez changer ceci pour certaines entrées, "
+"veuillez les sélectionner et utiliser le bouton 'Migrer' ci-dessous."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Si vous voulez savoir ce qui sera effectué lorsque vous migrerez les entrées sélectionnées, utilisez le bouton 'Montrer les changements' pour voir le LDIF."
+msgstr ""
+"Si vous voulez savoir ce qui sera effectué lorsque vous migrerez les entrées"
+" sélectionnées, utilisez le bouton 'Montrer les changements' pour voir le "
+"fichier LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Montrer les changements"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Pendant l'inspection LDAP, nous allons chercher les problèmes classiques qui peuvent arriver lorsque l’on migre vers une administration basée sur FusionDirectory. Vous devriez régler les problèmes ci-dessous afin de faciliter l’administration."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Vérifier à nouveau"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Création du fichier de configuration"
 
 #: setup/setup_finish.tpl.c:5
 msgid "Run %1 to put the correct right on fusiondirectory.conf"
-msgstr "Exécutez %1 pour mettre les droits correctement sur le fichier fusiondirectory.conf"
+msgstr ""
+"Exécutez %1 pour mettre les droits correctement sur le fichier "
+"fusiondirectory.conf"
 
 #: setup/setup_finish.tpl.c:8
 msgid "Download configuration"
@@ -4822,7 +4734,7 @@ msgstr "Télécharger la configuration"
 
 #: setup/setup_finish.tpl.c:11
 msgid "Status: "
-msgstr "Statut : "
+msgstr "Statut: "
 
 #: include/select/groupSelect/group-filter.tpl.c:2
 #: ihtml/themes/breezy/simple-filter.tpl.c:2
@@ -4836,7 +4748,9 @@ msgstr "Mot de passe perdu"
 
 #: ihtml/themes/breezy/recovery.tpl.c:11
 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"
+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
 msgid "Warning : this email is only valid for %1 minutes."
@@ -4846,7 +4760,10 @@ msgstr "Attention : ce courriel est uniquement valable pour %1 minutes."
 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 de manière simple. Entrez le mot de passe actuel et le nouveau mot de passe (deux fois) dans les champs ci-dessous et appuyez sur le bouton 'Changer'."
+msgstr ""
+"Cette fenêtre vous permet de changer votre mot de passe de manière simple. "
+"Entrez le mot de passe actuel et 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
@@ -4857,11 +4774,11 @@ msgstr "Répertoire"
 
 #: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
 msgid "New password repeated"
-msgstr "Confirmation du nouveau mot de passe"
+msgstr "Nouveau mot de passe"
 
 #: ihtml/themes/breezy/recovery.tpl.c:41
 msgid "Password strength"
-msgstr "Sécurité du mot de passe"
+msgstr "Niveau de sécurité du mot de passe"
 
 #: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
 msgid "Change"
@@ -4873,23 +4790,27 @@ msgstr "Cliquez ici pour changer votre mot de passe"
 
 #: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
 msgid "Success"
-msgstr "Succès"
+msgstr "Réussi"
 
 #: ihtml/themes/breezy/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
-msgstr "Votre mot de passe a été changé avec succès."
+msgstr "Votre mot de passe à été changé avec succès."
 
 #: ihtml/themes/breezy/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Entrez votre adresse de courriel actuelle dans le champ ci-dessous et appuyez sur le bouton «Changer»."
+msgstr ""
+"Entrez votre adresse de messagerie actuel dans le champ si dessous et "
+"appuyer sur le bouton 'Changer'"
 
 #: ihtml/themes/breezy/recovery.tpl.c:62
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
-msgstr "=> Indiquez votre adresse complète, ex: Jules Martin => jules.martin@exemple.fr"
+msgstr ""
+"=> Indiquez votre adresse complète, ex: Jules Martin => "
+"jules.martin@exemple.fr"
 
 #: ihtml/themes/breezy/recovery.tpl.c:74
 msgid "Email"
@@ -4899,7 +4820,9 @@ msgstr "Courriel"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "La fonction de récupération des mots de passe n'est pas activée. Si vous avez perdu votre mot de passe, contacter votre administrateur réseau"
+msgstr ""
+"La fonction de récupération des mots de passe n'est pas activée. Si vous "
+"avez perdu votre mot de passe, contacter votre administrateur réseau"
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4909,7 +4832,9 @@ msgstr "Fenêtre de connexion"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr "Veuillez utiliser votre nom d'utilisateur et votre mot de passe afin de vous connecter."
+msgstr ""
+"Veuillez utiliser 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
@@ -4918,7 +4843,7 @@ msgstr "Nom d'utilisateur"
 
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
-msgstr "J’ai perdu mon mot de passe"
+msgstr "j'ai perdu mon mot de passe"
 
 #: ihtml/themes/breezy/login.tpl.c:38
 msgid "Sign in"
@@ -4934,7 +4859,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "L'option size limit rend les opérations LDAP plus rapides et permet au serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile de gérer des grandes bases de données sans de longs temps d'attentes, serait de limiter la recherche à des valeurs plus petites et d'utiliser les filtres pour obtenir les valeurs que vous recherchez."
+msgstr ""
+"L'option size limit rend les opérations LDAP plus rapides et permet au "
+"serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile"
+" de gérer des grandes bases de données sans de longs temps d'attentes, "
+"serait de limiter la recherche à des valeurs plus petites et d'utiliser les "
+"filtres pour obtenir les valeurs que vous recherchez."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4942,17 +4872,22 @@ msgstr "Veuillez choisir la façon de réagir pour cette session"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignorer cette erreur et montrer toutes les entrées retournées par le serveur LDAP"
+msgstr ""
+"ignorer cette erreur et montrer toutes les entrées retournées par le serveur"
+" LDAP"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignorer cette erreur et montrer toutes les entrées dans la limite de taille définie et laissez moi utiliser les filtres pour restreindre les données a visualiser"
+msgstr ""
+"ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce"
+" au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
+"restreindre les données a visualiser"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
-msgstr "Valider"
+msgstr "Activer"
 
 #: ihtml/themes/breezy/simple-remove.tpl.c:2
 msgid "Warning: you are about to delete the following objects"
@@ -4963,12 +4898,17 @@ msgstr "Attention : Vous êtes sur le point de supprimer les objets suivants"
 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."
+msgstr ""
+"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données"
+" seront perdues étant donné qu'il est impossible pour FusionDirectory de "
+"récupérer vos données."
 
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/remove.tpl.c:8
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
+msgstr ""
+"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
+"'Annuler' pour abandonner."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -4980,12 +4920,12 @@ msgstr "Déconnexion"
 
 #: ihtml/themes/breezy/framework.tpl.c:8
 msgid "Signed in:"
-msgstr "Connecté :"
+msgstr "Connecté:"
 
 #: ihtml/themes/breezy/framework.tpl.c:11
 #, c-format
 msgid "Session expires in %d!"
-msgstr "La session expire dans %d !"
+msgstr "La session expire dans %d !"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:2
 msgid "Warning: you are about to restore the following snapshot"
@@ -4993,12 +4933,15 @@ msgstr "Attention : Vous êtes sur le point de restaurer l’instantané suiva
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:5
 msgid "Any modification made to the object since this snapshot will be lost."
-msgstr "Toute modification apportée à l’objet depuis cet instantané sera perdue."
+msgstr ""
+"Toute modification apportée à l’objet depuis cet instantané sera perdue."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:11
 msgid ""
 "So - if you're sure - press 'Continue' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous êtes sûr - cliquez sur 'Continuer' pour continuer ou 'Annuler' pour annuler."
+msgstr ""
+"Donc - si vous êtes sûr - cliquez sur 'Continuer' pour continuer ou "
+"'Annuler' pour annuler."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:14
 #: ihtml/themes/breezy/template.tpl.c:8
@@ -5018,7 +4961,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 "Si la détection de ce verrou est fausse, une autre personne a manifestement fermé la fenêtre de son navigateur durant une opération de modification d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur le bouton \"%1%\"."
+msgstr ""
+"Si la détection de ce verrou est fausse, une autre personne a manifestement "
+"fermé la fenêtre de son navigateur durant une opération de modification "
+"d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur "
+"le bouton \"%1\"."
 
 #: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
@@ -5028,28 +4975,40 @@ msgstr "Lecture seule"
 msgid ""
 "This may be used by several groups. Please double check if you really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr "Cela peut être utilisé par plusieurs groupes. Veuillez vérifier que vous voulez effectuer cette opération étant donné qu'il est impossible pour FusionDirectory de récupérer vos données."
+msgstr ""
+"Cela peut être utilisé par plusieurs groupes. Veuillez vérifier que vous "
+"voulez effectuer cette opération étant donné qu'il est impossible pour "
+"FusionDirectory de récupérer vos données."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:2
 msgid "Copy & paste wizard"
-msgstr "Assistant copier & coller"
+msgstr "Assistant pour le copier &amp; coller"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:5
 msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Certaines valeurs doivent être unique dans tout l'arbre et certaines combinaisons n'ont pas de sens. FusionDirectory vous montre les valeurs correspondantes. Veuillez régler les valeurs pour respecter les politiques de sécurité."
+msgstr ""
+"Certaines valeurs doivent être unique dans tout l'arbre et certaines "
+"combinaisons n'ont pas de sens. FusionDirectory vous montre les valeurs "
+"correspondantes. Veuillez maintenir les valeurs pour respecter les "
+"politiques de sécurité."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Veuillez vous souvenir que certaines propriétés comme les instantanés ne seront pas copiés !"
+msgstr ""
+"Veuillez vous souvenir que certaines propriétés comme les copie instantanées"
+" ne seront pas copiés !"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Ou si vous coupez ou copiez une entrée avec FusionDirectory et que vous effacez la source, vous pouvez rencontrer des erreurs en tentant de le coller à nouveau !"
+msgstr ""
+"Ou si vous couper ou copiez un entrée avec FusionDirectory et que vous "
+"effacer la source, vous pouvez rencontrer des erreurs en tentant de le "
+"coller à nouveau !"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5073,15 +5032,15 @@ msgstr "Type ACL"
 
 #: ihtml/themes/breezy/acl.tpl.c:11 ihtml/themes/breezy/acl.tpl.c:14
 msgid "Select an acl type"
-msgstr "Sélectionnez un type d’ACL"
+msgstr "Sélectionnez un type d'acl"
 
 #: ihtml/themes/breezy/acl.tpl.c:17
 msgid "Additional filter options"
-msgstr "Paramètres supplémentaires pour le filtre"
+msgstr "Paramètres supplémentaire pour le filtre"
 
 #: ihtml/themes/breezy/acl.tpl.c:20
 msgid "Use members from"
-msgstr "Utiliser les membres de"
+msgstr "Utiliser les membres depuis"
 
 #: ihtml/themes/breezy/acl.tpl.c:23
 msgid "Available members"
@@ -5101,7 +5060,7 @@ msgstr "ACL pour cet objet"
 
 #: ihtml/themes/breezy/acl.tpl.c:47
 msgid "Available roles"
-msgstr "Rôles disponibles"
+msgstr "Type de rôles disponibles"
 
 #: plugins/generic/welcome/welcome.tpl.c:2
 msgid "The FusionDirectory team"
@@ -5115,7 +5074,9 @@ msgstr "<strong>%1</strong> fait référence à <strong>%3</strong>"
 msgid ""
 "<strong>%1</strong> references our field <strong>%3</strong> from tab "
 "<strong>%2</strong>"
-msgstr "<strong>%1</strong> fait référence au champ <strong>%3</strong> du tab <strong>%2</strong>"
+msgstr ""
+"<strong>%1</strong> fait référence au champ <strong>%3</strong> du tab "
+"<strong>%2</strong>"
 
 #: plugins/generic/references/contents.tpl.c:8
 msgid "This object has no relationship to other objects."
@@ -5147,17 +5108,20 @@ msgstr "Suppression de l'image personnelle"
 
 #: plugins/personal/generic/nochange.tpl.c:2
 msgid "You have no permission to change your password at this time"
-msgstr "Vous n'avez pas le droit de changer votre mot de passe"
+msgstr ""
+"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
 
 #: plugins/personal/generic/nochange.tpl.c:5
 msgid "Your password hash method will not be changed!"
-msgstr "Votre méthode de chiffrement des mots de passe ne sera pas changée !"
+msgstr "Votre méthode de cryptage des mots de passe ne sera pas changé !"
 
 #: plugins/personal/generic/changed.tpl.c:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Votre mot de passe a été changé. N'oubliez pas de modifier les programmes qui l'utilisent."
+msgstr ""
+"Votre mot de passe a été changé. N'oubliez pas de modifier les programmes "
+"qui l'utilisent."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
@@ -5168,7 +5132,7 @@ msgstr[1] "Il y a %1 groupes :"
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] "l'un deux est un groupe %1 "
+msgstr[0] "L'un deux est un groupe %1"
 msgstr[1] "%2 sont des groupes %1"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:8
@@ -5195,13 +5159,13 @@ msgstr "Aucun d’eux n’a un compte %1"
 #: 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] "Un d’entre utilisent la méthode %1"
-msgstr[1] "%2 d’entre utilisent la méthode %1"
+msgstr[0] "Un d'entre eux utilise la méthode %1"
+msgstr[1] "%2 d’entre eux utilisent la méthode %1"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] "Un d'entre eux est verrouillé"
+msgstr[0] "Un est verrouille"
 msgstr[1] "%1 d’entre eux sont verrouillés"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
@@ -5248,17 +5212,17 @@ msgstr "Date d'expiration du mot de passe"
 #: plugins/addons/dashboard/users_accounts.tpl.c:26
 #: plugins/addons/dashboard/users_accounts.tpl.c:59
 msgid "manager"
-msgstr "Responsable"
+msgstr "manager"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:29
 #: plugins/addons/dashboard/users_accounts.tpl.c:62
 msgid "mail"
-msgstr "Courriel"
+msgstr "courriel"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:35
 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] "Il y a un compte expirant dans les prochains jours"
+msgstr[0] "Il y a un compte qui expire dans les %1 prochain jours"
 msgstr[1] "Il y a %2 comptes qui expirent dans les %1 prochains jours"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:38
@@ -5275,32 +5239,38 @@ msgstr "Afficher les modèles"
 
 #: plugins/admin/users/user-filter.tpl.c:8
 msgid "Show functional users"
-msgstr "Afficher les utilisateurs fonctionnels"
+msgstr "montrer les utilisateurs fonctionnels"
 
 #: plugins/admin/users/user-filter.tpl.c:11
 msgid "Show POSIX users"
-msgstr "Afficher les utilisateurs POSIX"
+msgstr "Montrer les utilisateurs Posix"
 
 #: plugins/admin/users/user-filter.tpl.c:14
 msgid "Show Mail users"
-msgstr "Afficher les utilisateurs de courriel"
+msgstr "Montrer les utilisateurs de la messagerie"
 
 #: plugins/admin/users/user-filter.tpl.c:17
 msgid "Show Samba users"
-msgstr "Afficher les utilisateurs Samba"
+msgstr "Montrer les utilisateurs samba"
 
 #: plugins/admin/acl/remove.tpl.c:2
 msgid ""
 "Warning: you are about to delete the ACL assignments on the following "
 "objects"
-msgstr "Attention: vous êtes sur le point de supprimer les assignations d'ACL sur les objets suivants"
+msgstr ""
+"Attention: vous êtes sur le point de supprimer les assignations d'ACL sur "
+"les objets suivants"
 
 #: 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 "Cela comprend toutes les affectations ACL faites sur ce(s) noeud(s). Si vous voulez la liste de ces assignations, annulez et ouvrez les objets."
+msgstr ""
+"Cela comprend toutes les affectations ACL faites sur ce noeud (s). Si vous "
+"voulez la liste de ces assignations, annuler et ouvrez les objets."
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
+msgstr ""
+"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
+"'Annuler' pour abandonner."
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index af6159c7f97d0b73d9530b1ddfa43e0fffa16857..498c2b9b13f513e1c78d8a50816b5728f207a8c2 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -1,944 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Szabi Fekete <szabi@equio.co.uk>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Felhasználók"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Felhasználók"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr ""
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -950,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -981,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1291,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1353,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1602,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1611,7 +1472,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1683,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1957,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2021,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2103,13 +1972,12 @@ msgstr "Név"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Leírás"
@@ -2120,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2161,8 +2031,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2171,130 +2041,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2334,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2344,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2395,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2446,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2519,36 +2400,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2596,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2663,225 +2539,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2908,7 +2567,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2929,278 +2588,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3309,7 +2984,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3414,549 +3089,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4055,9 +3663,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4185,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4246,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4266,8 +3873,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Csoport neve"
 
@@ -4291,163 +3897,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4497,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4746,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4760,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 9e8c664fb365b6ea48f6ebde105527386e386d6b..1984f8226da816f45bcffa396ec98a38153bb577 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -1,943 +1,829 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr ""
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +835,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +866,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1152,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1214,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1463,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1471,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1543,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1820,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1883,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,11 +1987,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2030,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2040,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2227,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2237,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2288,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2322,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2399,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2471,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2538,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2566,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2587,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2983,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3088,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3662,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3791,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3852,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3872,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3896,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4094,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4339,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4351,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index ae4d2a0a831209266f00e6cba13b0ac769582a91..f234d710d055a7599bceb0169a222a277fe3faec 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -1,947 +1,911 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2016-2017
-# Paola Penati <paola.penati@opensides.be>, 2016-2017
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-30 14:35+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Impostazioni della lingua"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Questa tappa ti permette di impostare la tua lingua preferita."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
-msgstr "A questo punto , è possibile selezionare la lingua predefinita a livello di sito . Scegliendo \" automatico\" utilizzerà la lingua richiesta dal browser. Questa impostazione può essere sovrascritto per utente ."
+msgstr ""
+"A questo punto , è possibile selezionare la lingua predefinita a livello di "
+"sito . Scegliendo \" automatico\" utilizzerà la lingua richiesta dal "
+"browser. Questa impostazione può essere sovrascritto per utente ."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr "Connessione LDAP"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nome del luogo"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr "Nome di questo collegamento per mostrare nell'elenco dei server LDAP"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI di connessione"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr "URI per contattare il server LDAP. Di solito inizia con ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Connessione TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr "TLS dovrebbe essere usato per connetterlo a questo server LDAP?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "Base del directory LDAP"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autentificazione"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"DN dell'account amministratore da utilizzare per il legame alla LDAP . La "
+"base viene automaticamente aggiunta."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN dell'amministratore"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Password dell'amministratore"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+"Password dell'account amministratore da utilizzare per il legame alla LDAP ."
+" "
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Stato"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Stato attuale"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+"Risultato dell'ultimo tentativo di controllo dei vincoli LDAP e degli schemi"
+" di base."
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configurazione di LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configurazione della connessione di LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Questa finestra permette di indicare la configurazione di base di LDAP per "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "La connessione anonima sul server '%s' è fallita !"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "La connessione dell'utente '%s' è fallita !"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Riprova"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La connessione anonima al server '%s' è riuscita."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Specifica il nome utente e la password !"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "La connessione dell'utente '%s' al server '%s' è riuscita !"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+"%s\n"
+"Schema \"%s\": %s"
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Errore di configurazione"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completato"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Successivo"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Benvenuto"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finito"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Finito - Scrivi il file di configurazione"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Scrivi il file di configurazione"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Il file di configurazione è attualmente accessibile in lettura a tutti. "
+"Aggiorna i permessi di accesso sul file !"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+"Il file di configurazione attualmente non è leggibile oppure non esiste."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia "
+"solo l'account abilitato al server Web a poter leggere %s, mentre gli altri "
+"account non dovrebbero."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Verifica del modulo PHP e delle sue estensioni"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
-msgstr "Configurazione di installazione PHP (<a href=\"?info\" target=\"_blank\">mostra informazione)</a>)"
+msgstr ""
+"Configurazione di installazione PHP (<a href=\"?info\" "
+"target=\"_blank\">mostra informazione)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Verifica dell'istallazione"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr "Verifiche di base della compatibilità PHP e delle estensioni necessarie"
+msgstr ""
+"Verifiche di base della compatibilità PHP e delle estensioni necessarie"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Controllo della versione di PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP deve essere nella versione %s o superiore."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Aggiorna ad una versione supportata."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory ha bisogno di questo modulo per poter comunicare con il server LDAP."
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per poter comunicare con il "
+"server LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory ha bisogno di questo modulo per l'interfaccia multilingue."
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per l'interfaccia multilingue."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory ha bisogno di questo modulo per comunicare con differenti tipi di server e protocolli."
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per comunicare con differenti "
+"tipi di server e protocolli."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
-msgstr "FusionDirectory ha bisogno di questo modulo per codificare le variabili per l'uso di JavaScript."
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per codificare le variabili per "
+"l'uso di JavaScript."
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
-msgstr "FusionDirectory richiede questo modulo per filtrare una variabile con un filtro specificato."
+msgstr ""
+"FusionDirectory richiede questo modulo per filtrare una variabile con un "
+"filtro specificato."
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
-msgstr "FusionDirectory ha bisogno di questo modulo per l'integrazione di Samba"
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per l'integrazione di Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory richiede il modulo 'mhash' oppure 'sha1' per poter utilizzare l'algoritmo di criptaggio SSHA."
+msgstr ""
+"FusionDirectory richiede il modulo 'mhash' oppure 'sha1' per poter "
+"utilizzare l'algoritmo di criptaggio SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory ha bisogno di questo modulo per comunicare con il server IMAP."
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per comunicare con il server "
+"IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr "FusionDirectory ha bisogno di questo modulo per gestire i caratteri Unicode."
+msgstr ""
+"FusionDirectory ha bisogno di questo modulo per gestire i caratteri Unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
-msgstr "FusionDirectory ha bisogno di questa estensione per gestire le immagini."
+msgstr ""
+"FusionDirectory ha bisogno di questa estensione per gestire le immagini."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "modulo di compressione"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr "FusionDirectory ha bisogno di questa estensione per gestire gli snapshot (le copie istantanee)."
+msgstr ""
+"FusionDirectory ha bisogno di questa estensione per gestire gli snapshot (le"
+" copie istantanee)."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals è un meccanismo PHP che permette di registrare tutte le variabili globali affinchè gli scripts possano accedervi senza cambiare la portata delle variabili. Questo puó generare un rischio per la sicurezza."
+msgstr ""
+"register_globals è un meccanismo PHP che permette di registrare tutte le "
+"variabili globali affinchè gli scripts possano accedervi senza cambiare la "
+"portata delle variabili. Questo puó generare un rischio per la sicurezza."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Cerca l'opzione register_globals nel tuo file php.ini e impostalo su 'Off'."
+msgstr ""
+"Cerca l'opzione register_globals nel tuo file php.ini e impostalo su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr "PHP utilizza questa variabile per cancellare delle vecchie sessioni."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Impostare questa variabile a \"1 giorno\" eviterà di perdere i coockies e le sessioni prima che siano realmente scadute."
+msgstr ""
+"Impostare questa variabile a \"1 giorno\" eviterà di perdere i coockies e le"
+" sessioni prima che siano realmente scadute."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Cerca la variabile 'session.gc_maxlifetime' nel tuo file php.ini e impostala a 86400 o un valore più grande."
+msgstr ""
+"Cerca la variabile 'session.gc_maxlifetime' nel tuo file php.ini e impostala"
+" a 86400 o un valore più grande."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Off"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Per non avere problemi nell'uso di FusionDirectory, è necessario impostare l'opzione 'session.auto_start' su 'Off' nel file php.ini."
+msgstr ""
+"Per non avere problemi nell'uso di FusionDirectory, è necessario impostare "
+"l'opzione 'session.auto_start' su 'Off' nel file php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Cerca la variabile 'session.auto_start' nel file php.ini e impostala su 'Off'."
+msgstr ""
+"Cerca la variabile 'session.auto_start' nel file php.ini e impostala su "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory ha un bisogno minimo di 128MB di memoria. Meno di 128MB di memoria causeranno degli errori imprevisti che non saranno riproducibili ! Aumenta la memoria per delle installazioni più complesse."
+msgstr ""
+"FusionDirectory ha un bisogno minimo di 128MB di memoria. Meno di 128MB di "
+"memoria causeranno degli errori imprevisti che non saranno riproducibili ! "
+"Aumenta la memoria per delle installazioni più complesse."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Cerca la variabile 'memory_limit' nel file php.ini e impostala su '128MB' o un valore più grande."
+msgstr ""
+"Cerca la variabile 'memory_limit' nel file php.ini e impostala su '128MB' o "
+"un valore più grande."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Questa opzione influenza la gestione delle uscite. Per aumentare le prestazioni, impostala su 'Off'."
+msgstr ""
+"Questa opzione influenza la gestione delle uscite. Per aumentare le "
+"prestazioni, impostala su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr "Cerca la variabile 'implicit_flush' nel file php.ini e impostala su 'Off'."
+msgstr ""
+"Cerca la variabile 'implicit_flush' nel file php.ini e impostala su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Il tempo di esecuzione deve essere di almeno 30 secondi."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Cerca la variabile 'max_execution_time' nel file php.ini e impostala su '30' o un valore più grande."
+msgstr ""
+"Cerca la variabile 'max_execution_time' nel file php.ini e impostala su '30'"
+" o un valore più grande."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Aumenta la sicurezza del tuo server impostando la variabile 'expose_php' su 'Off'. PHP non trasmetterà alcuna informazione a proposito del server che stai configurando."
+msgstr ""
+"Aumenta la sicurezza del tuo server impostando la variabile 'expose_php' su "
+"'Off'. PHP non trasmetterà alcuna informazione a proposito del server che "
+"stai configurando."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr "Cerca la variabile 'expose_php' nel file php.ini e impostala su 'Off'."
+msgstr ""
+"Cerca la variabile 'expose_php' nel file php.ini e impostala su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Aumenta le prestazioni del tuo server impostando la variabile 'magic_quotes_gpc' su 'Off'."
+msgstr ""
+"Aumenta le prestazioni del tuo server impostando la variabile "
+"'magic_quotes_gpc' su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e impostala su 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Benvenuto"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Benvenuto nell'interfaccia di aiuto alla configurazione di FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Messaggio di benvenuto"
+msgstr ""
+"Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e "
+"impostala su 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migra"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Ispezione dell'annuario LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analisi dell'annuario LDAP per la compatibilità con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Dare tutti i diritti sugli utenti nel ramo dato"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
-msgstr "Permette agli utenti di modificare le proprie informazioni (uso di scheda e posix principale solo sulla base)"
+msgstr ""
+"Permette agli utenti di modificare le proprie informazioni (uso di scheda e "
+"posix principale solo sulla base)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
-msgstr "Permette agli utenti di modificare la loro password (usare solo su base)"
+msgstr ""
+"Permette agli utenti di modificare la loro password (usare solo su base)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Ispezione delle classi di oggetti nell'oggetto radice"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Verifica del permesso di accesso al database LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Verifica degli utenti nascosti"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Verifica del super amministratore"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Controllo per i ruoli ed i gruppi ACL predefiniti"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Verifica degli utenti al di fuori del ramo \"people\""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Verifica dei gruppi al di fuori del ramo \"groups\""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Verifica dei dipartimenti nascosti"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Verifica dei possibili doppioni UID"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr "Verifica dei possibili doppioni GID"
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "La richiesta al database LDAP è fallita!"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr "Forse l'\"oggetto radice\" é mancante"
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Fallito"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "L'oggetto di classe '%s' richiesto per FusionDirectory è mancante !"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Verifica la tua installazione."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "Impossibile gestire il tipo di oggetto strutturale del tuo oggetto radice. Prova ad aggiungere manualmente la classe d'oggetto '%s'. "
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"Impossibile gestire il tipo di oggetto strutturale del tuo oggetto radice. "
+"Prova ad aggiungere manualmente la classe d'oggetto '%s'. "
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr "L'utente \"%s\" non ha accesso completo al vostro database LDAP."
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr "L'utente \"%s\" non ha pieno accesso al database LDAP."
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Ho trovato %s utenti(e) che non saranno visibili in FusionDirectory che sono incompleti."
+msgstr ""
+"Ho trovato %s utenti(e) che non saranno visibili in FusionDirectory che sono"
+" incompleti."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Migrazione utente"
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Errore durante la migrazione"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Impossibile eseguire la migrazione di voce \"%s\":"
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "FD 1.0.7 account amministrativi trovati: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Utenti"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "FD 1.0.7 gruppi amministrativi trovati: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Gruppi"
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr "é possibile eseguire <i>fusiondirectory-setup --migrate-acls</i> dopo aver salvato il file do configurazione al termine della messa a punto per la migrazione."
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Ruoli"
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgstr ""
+"Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario "
 "LDAP."
-msgstr "Non vi è alcun account amministratore FusionDirectory 1.0.8 valido all'interno del vostro LDAP ."
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Crea"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Utenti"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr "Gruppi"
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr "Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario LDAP."
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Dà tutti i diritti su ogni oggetto"
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Errore"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "I ruoli ACL di default non sono stati inseriti"
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Mancano alcuni ruoli ACL di default"
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Ruoli ACL di default sono stati inseriti"
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Impossibile aggiungere ruolo \"%s\" ACL "
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, 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_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Sposta gli utenti nel ramo utenti configurato nell'annuario"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr "Impossibile spostare le entrate nel dipartimento richiesto!"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "L'entrata verrà spostata"
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "verso"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Le seguenti reference saranno aggiornate"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, 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_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Sposta i gruppi nel ramo di gruppi configurato"
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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."
+msgstr ""
+"Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr "Migrazione Dipartilento"
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr "Trovati %s valori duplicati per l'attributo \"uidNumber\":%s"
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr "Trovati %s valori duplicati per l'attributo \"gidNumber\":%s"
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr "Connessione LDAP"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nome del luogo"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr "Nome di questo collegamento per mostrare nell'elenco dei server LDAP"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI di connessione"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI per contattare il server LDAP. Di solito inizia con ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Connessione TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "TLS dovrebbe essere usato per connetterlo a questo server LDAP?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "Base del directory LDAP"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autentificazione"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr "DN dell'account amministratore da utilizzare per il legame alla LDAP . La base viene automaticamente aggiunta."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN dell'amministratore"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Password dell'amministratore"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr "Password dell'account amministratore da utilizzare per il legame alla LDAP . "
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Stato"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Stato attuale"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr "Risultato dell'ultimo tentativo di controllo dei vincoli LDAP e degli schemi di base."
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configurazione di LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configurazione della connessione di LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Questa finestra permette di indicare la configurazione di base di LDAP per FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "La connessione anonima sul server '%s' è fallita !"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "La connessione dell'utente '%s' è fallita !"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Riprova"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La connessione anonima al server '%s' è riuscita."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Specifica il nome utente e la password !"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "La connessione dell'utente '%s' al server '%s' è riuscita !"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr "%s\nSchema \"%s\": %s"
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finito"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Finito - Scrivi il file di configurazione"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Scrivi il file di configurazione"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Il file di configurazione è attualmente accessibile in lettura a tutti. Aggiorna i permessi di accesso sul file !"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Il file di configurazione attualmente non è leggibile oppure non esiste."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia solo l'account abilitato al server Web a poter leggere %s, mentre gli altri account non dovrebbero."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Errore di configurazione"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Completato"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr ""
+"Benvenuto nell'interfaccia di aiuto alla configurazione di FusionDirectory"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Successivo"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Messaggio di benvenuto"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Registrazione nel giornale di sistema non riuscita : %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr "Opzione '%s' non valida!"
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "Il tipo d'oggetto specificato è vuoto oppure non è valido !"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "non configurato"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Errore di filtro"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Il filtro non è completo!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Autorizzazioni"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Errore d'autorizzazione"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "Nessuna dichiarazione per '% s' nel file di configurazione. Impossibile inizializzare il plugin !"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Invia"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Sopra"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Sotto"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr "Ordina in modo crescente"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr "Ordina in modo decrescente"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Errore"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "Creato da"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Sali di un dipartimento"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr "Vai al dipartimento dell'utente"
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Ricarica la lista"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Azioni"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copia"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Taglia"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Incolla"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Taglia questa voce"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Copia questa voce"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Restaura le 'copie istantanee'"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Lista d'esportazione"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Restaura la 'copia istantanea'"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Crea una 'copia istantanea'"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Errore fatale"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "nel"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "on line"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Errore XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -951,14 +915,16 @@ msgstr "Impossibile cambiare la password, '%s' utente sconosciuto"
 msgid ""
 "You need to fill saslRealm or saslExop in the configuration screen in order "
 "to use SASL"
-msgstr "é necessario compilare saslRealm o saslExop nello schermo di configurazione per usare SASL"
-
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+msgstr ""
+"é necessario compilare saslRealm o saslExop nello schermo di configurazione "
+"per usare SASL"
+
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Errore di configurazione"
@@ -969,7 +935,8 @@ msgstr "Pagina"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr "L'esportazione PDF non è possibile: non ci sono librerie PDF installate."
+msgstr ""
+"L'esportazione PDF non è possibile: non ci sono librerie PDF installate."
 
 #: include/exporter/class_pdfExporter.inc:196
 msgid "PDF"
@@ -982,358 +949,372 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Il canale richiesto non esiste! Contatta l'amministratore del sistema."
+msgstr ""
+"Il canale richiesto non esiste! Contatta l'amministratore del sistema."
+
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Autorizzazioni"
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annulla tutto"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Impossibile incollare"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Nome utente"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modello"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
-msgstr "Modello di oggetti, utilizzato per creare diversi oggetti con valori simili"
+msgstr ""
+"Modello di oggetti, utilizzato per creare diversi oggetti con valori simili"
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nome del modello"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Errore fatale: non è stato definito nessuno spazio per le classi - esegui '%s' per porre rimedio al problema"
+msgstr ""
+"Errore fatale: non è stato definito nessuno spazio per le classi - esegui "
+"'%s' per porre rimedio al problema"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per porre rimedio al problema"
+msgstr ""
+"Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per "
+"porre rimedio al problema"
+
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Errore fatale"
 
-#: include/functions.inc:493
+#: include/functions.inc:475
 #, 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'"
+msgstr ""
+"Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
-msgstr "Il login (uid) non é unico all'interno della struttura LDAP. Per favore contattare il vostro amministratore di sistema."
+msgstr ""
+"Il login (uid) non é unico all'interno della struttura LDAP. Per favore "
+"contattare il vostro amministratore di sistema."
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Errore di autentificazione"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
-msgstr "Sembrerebbe che la password sia scaduta. Per favore utilizzare <a href=\"recovery.php\"> recupero password </a> per cambiarla"
+msgstr ""
+"Sembrerebbe che la password sia scaduta. Per favore utilizzare <a "
+"href=\"recovery.php\"> recupero password </a> per cambiarla"
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Errore all'aggiunta di un bloccaggio. Contatta i programmatori !"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta l'amministratore del sistema !"
+msgstr ""
+"Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta "
+"l'amministratore del sistema !"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Il server LDAP ha risposto: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
+msgstr ""
+"Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. "
+"Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Il valore limite dell'entries %d è stato superato !"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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"
+msgstr ""
+"Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo "
+"stesso valore è superato"
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configura"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Prosegui comunque"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Modifica malgrado l'avvertimento"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Voci per pagina"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Applica filtro"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup --check-directories per correggerne i privilegi di accesso."
+msgstr ""
+"Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup "
+"--check-directories per correggerne i privilegi di accesso."
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Impossibile scrivere il file di revisione !"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Impossibile leggere il file di revisione !"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'prossimo Hook ID\" non é disponibile. Usa una base predefinita!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
+msgstr "Impossibile leggere il file di revisione!"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Avvertimento LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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 !"
+msgstr ""
+"Impossibile trovare informazioni sugli schemi a partire dal server. Nessuna "
+"verifica degli schemi è stata effettuata !"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr "Schema principale di FusionDirectory"
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
-msgstr "Schema utilizzato per memorizzare la configurazione di FusionDirectory"
+msgstr ""
+"Schema utilizzato per memorizzare la configurazione di FusionDirectory"
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
-msgstr "Utilizzato per memorizzare le informazioni in modalità fiducia in utenti o gruppi."
+msgstr ""
+"Utilizzato per memorizzare le informazioni in modalità fiducia in utenti o "
+"gruppi."
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr "Usato per memorizzare i modelli."
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr "Usato per memorizzare le informazioni POSIX."
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Manca la classe di oggetti necessaria \"%s\"!"
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Manca classe di oggetti optional \"%s\"!"
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(i) disponibile(i)"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
-msgstr "Avete installato il plugin di gruppi misti, ma la configurazione dello schema non supporta questo."
+msgstr ""
+"Avete installato il plugin di gruppi misti, ma la configurazione dello "
+"schema non supporta questo."
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 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:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
-msgstr "Il vostro schema é configurato per supportare gruppi misti, ma manca il plugin."
+msgstr ""
+"Il vostro schema é configurato per supportare gruppi misti, ma manca il "
+"plugin."
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "L'objectClass \"posixGroup\" deve essere STRUTTURALE"
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Impossibile assegnare un ID libero:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "Metodo idAllocation sconosciuto !"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool non è univoco !"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "nessun ID disponibile !"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "Il numero massimo di tentativi è stato superato"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Impossibile assegnare un ID libero!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
+msgstr ""
+"Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Tutti gli oggetti in questa categoria"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Correggi l'errore qui sotto e ricarica la pagina."
 
 #: include/class_timezone.inc:52
 #, php-format
 msgid "The timezone setting \"%s\" in your configuration is not valid."
-msgstr "L'impostazione  \"%s\" del fuso orario nella vostra configurazione non é valida."
+msgstr ""
+"L'impostazione  \"%s\" del fuso orario nella vostra configurazione non é "
+"valida."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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 "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."
+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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
+msgstr ""
+"Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, 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:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "La funzione 'copia istantanea' è attivata, ma la variabile richiesta '%s' non è configurata."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
+"La funzionalità snapshot è attivata, ma la variabile \"%s\" richiesta non è "
+"impostata."
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "La funzione 'copia istantanea' è attivata, ma il modulo di compressione richiesto è introvabile. Per favore installa '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
+"La funzionalità snapshot è abilitata, ma manca il modulo di compressione "
+"richiesto. Si prega di installare \"%s\"."
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Tutte le categorie"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Identità personale"
 
@@ -1356,7 +1337,7 @@ msgstr "Seleziona per avere la lista degli oggetti che hanno '%s' attivato"
 msgid "Select to search within subtrees"
 msgstr "Seleziona per ricercare nella sottostruttura"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Cerca nella sottostruttura"
 
@@ -1434,7 +1415,7 @@ msgstr "Non hai il permesso di modificare i campi \"%s\" di oggetto \"%s\""
 #: include/class_msgPool.inc:153 include/class_msgPool.inc:158
 #, php-format
 msgid "You have no permission to modify the object:<br/>%s"
-msgstr "Non hai il permesso di modificare l'oggetto:<br/>%s"
+msgstr "Non ha il permesso di modificare l'oggetto:<br/>%s"
 
 #: include/class_msgPool.inc:161
 #, php-format
@@ -1498,7 +1479,9 @@ msgstr "Il campo '%s' contiene una parola chiave riservata !"
 #: include/class_msgPool.inc:297
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr "Il comando '%s', specificato come connessione dell'estensione '%s' non esiste !"
+msgstr ""
+"Il comando '%s', specificato come connessione dell'estensione '%s' non "
+"esiste !"
 
 #: include/class_msgPool.inc:313
 #, php-format
@@ -1538,7 +1521,8 @@ msgstr "Impossibile eseguire l'opzione '%s' del comando (%s) !"
 #: include/class_msgPool.inc:347
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Impossibile eseguire l'opzione '%s' del comando (%s) per l'estensione %s !"
+msgstr ""
+"Impossibile eseguire l'opzione '%s' del comando (%s) per l'estensione %s !"
 
 #: include/class_msgPool.inc:362
 #, php-format
@@ -1605,8 +1589,7 @@ msgid "Missing %s PHP extension!"
 msgstr "Estensione PHP %s  mancante !"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1614,7 +1597,7 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Applica"
@@ -1670,258 +1653,279 @@ msgstr "Questa identità non possiede valide estensioni %s !"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Questa identità ha i parametri %s attivati. Puoi disattivarli cliccando sul bottone qui sotto."
+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
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Questa identità ha i parametri %s attivati. Per disattivarla hai bisogno di rimuovere prima di tutto i parametri %s !"
+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
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Questa identità ha i parametri %s disattivati. Puoi attivarli cliccando sul bottone qui sotto."
+msgstr ""
+"Questa identità ha i parametri %s disattivati. Puoi attivarli cliccando sul "
+"bottone qui sotto."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "Questa identità ha i parametri %s disattivati. Per attivarli devi prima di tutto impostare i parametri %s !"
+msgstr ""
+"Questa identità ha i parametri %s disattivati. Per attivarli devi prima di "
+"tutto impostare i parametri %s !"
 
-#: include/class_msgPool.inc:635
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+"Questo account ha disattivato le impostazioni %s. Per abilitarle, devi prima"
+" disabilitare le impostazioni %s!"
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Imposta i parametri %s"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Rimuovi i parametri %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 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"
+msgstr ""
+"Clicka sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
+"questa finestra"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Gennaio"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febbraio"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Aprile"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Maggio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Giugno"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Luglio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Settembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Ottobre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Dicembre"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domenica"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunedi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Mercoledi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Giovedi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Venerdi"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sabato"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "L'operazione sul database è fallita!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "operazione di lettura"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "operazione di aggiunta"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "operazione di modifica"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "operazione di rimozione"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "operazione di ricerca"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autentificazione"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP %s è fallita!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP è fallita!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Oggetto"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "L'invio è fallito !"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Invio fallito: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura !"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Questo '%s' è attualmente in uso."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Il file '%s' non esiste !"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Il file '%s' non puó essere aperto in lettura !"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Il file '%s' non puó essere aperto in scrittura !"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "Il valore di '%s' nno è ancora stato configurato oppure non è valido, verifica il file di configurazione !"
+msgstr ""
+"Il valore di '%s' nno è ancora stato configurato oppure non è valido, "
+"verifica il file di configurazione !"
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Il file '%s' non puó essere cancellato !"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "La cartella '%s' non puó essere creata  !"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "La cartella '%s' non puó essere cancellata !"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificazione del supporto per %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Istalla e attiva il modulo PHP %s."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installa e attiva il modulo Pear %s."
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Impossibile inizializzare la classe '%s' ! Forse manca un'estensione nell'installazione di FusionDirectory ?"
+msgstr ""
+"Impossibile inizializzare la classe '%s' ! Forse manca un'estensione "
+"nell'installazione di FusionDirectory ?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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 !"
+msgstr ""
+"La base qui fornita non è valida ed è stata reimpostata al suo valore "
+"originario !"
 
 #: include/class_SnapshotDialogs.inc:30
 msgid "Creating an object snapshot"
@@ -1960,7 +1964,6 @@ msgid "Restoring snapshots"
 msgstr "Ripristinare snapshots"
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Copie istantanee"
 
@@ -2010,11 +2013,14 @@ msgstr "Argomenti"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "La creazione di questa pagina, secondo l'interprete PHP, ha generato degli errori ! "
+msgstr ""
+"La creazione di questa pagina, secondo l'interprete PHP, ha generato degli "
+"errori ! "
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
-msgstr "Invia i tuoi commenti a proposito di un bug al Team di FusionDirectory"
+msgstr ""
+"Invia i tuoi commenti a proposito di un bug al Team di FusionDirectory"
 
 #: include/php_setup.inc:237
 msgid "Send bugreport"
@@ -2024,69 +2030,90 @@ msgstr "Invia un rapporto di bug"
 msgid "Toggle information"
 msgstr "Mostra/Nascondi l'informazione"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Avvertimento sul rendimento"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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 !"
+msgstr ""
+"Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è durata "
+"%.2fs !"
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
-msgstr "Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": alcun class object trovato!"
+msgstr ""
+"Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": "
+"alcun class object trovato!"
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
-msgstr "Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": non supportato"
+msgstr ""
+"Impossibile creare automaticamente delle sottostrutture con RDN \"%s\": non "
+"supportato"
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "durante l'operazione sul server LDAP %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open non é riuscito ad eseguire la ricerca LDAP"
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, 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 "
+msgstr ""
+"Errore alla Linea %s, la prima riga di una voce non puo'iniziare con uno "
+"spazio "
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, 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"
+msgstr ""
+"Errore alla linea %s, i riferimenti ad un file esterno non sono supportati"
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, 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:1163
+#: include/class_ldap.inc:1076
 #, 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:1168
+#: include/class_ldap.inc:1081
 #, 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"
+msgstr ""
+"Errore alla linea %s, un blocco d'ingresso dovrebbe iniziare con il dn"
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, 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"
+msgstr ""
+"Errore durante l'importazione del dn: \"%s\", verifica il tuo file LDIF a "
+"partire dalla linea %s"
+
+#: include/class_templateHandling.inc:474
+#, 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 ""
+"La dipendenza riccorsiva nei campi di modello: \"%1$s\" non puo' dipendere "
+"da \"%2$s\" dato che \"%2$s\" dipende già da \"%1$s\""
 
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
@@ -2094,11 +2121,10 @@ msgstr "Seleziona le entries desiderate"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2106,13 +2132,12 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descrizione"
@@ -2123,11 +2148,13 @@ msgid "POSIX group %s"
 msgstr "Gruppo POSIX %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Ruolo %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Raggruppa %s"
@@ -2164,8 +2191,8 @@ msgstr "Modifica"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2174,130 +2201,161 @@ msgstr "Modifica"
 msgid "Remove"
 msgstr "Elimina"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "Non è stata trovata nessuna estensione per inizializzare '%s', verifica il file di configurazione."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "La cancellazione è stata interrotta dall'estensione '%s': %s"
+msgstr ""
+"Nessuna definizione di plugin trovato per inizializzare \"%s\", si prega di "
+"consultare il file di configurazione."
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr "Passare da \"%s\" a \"%s\" non riuscito"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "secondi"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minuti"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "ore"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "giorni"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Modello"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "Modello %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Mostra %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Errore di filtro"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Il filtro non è completo!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Errore d'autorizzazione"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "Nessuna etichetta"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr "Impostazioni del template"
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Questo è il nome del template"
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr "Solo la scheda principale puo' calcolare il dn"
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, 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:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
-msgstr "Impossibile calcolare il dn: impossibile trovare le informazioni di objectType in questa  classe scheda \"%s\""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Errore durante il salvataggio"
+msgstr ""
+"Impossibile calcolare il dn: impossibile trovare le informazioni di "
+"objectType in questa  classe scheda \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "La voce %s non esiste"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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 "L'oggetto é cambiato dopo l'apertura in FusionDurectory. Tutte le modifiche che possono essere state fatte da altri andranno perse se si salva questa voce !"
+msgstr ""
+"L'oggetto é cambiato dopo l'apertura in FusionDurectory. Tutte le modifiche "
+"che possono essere state fatte da altri andranno perse se si salva questa "
+"voce !"
+
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr "Servizio \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1039
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Campo \"%s\" sconosciuto"
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2310,7 +2368,9 @@ msgstr "Base dell'oggetto"
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:137
 #, 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"
+msgstr ""
+"Il valore \"%s\" per il campo \"%s\" non si trova nella lista delle scelte "
+"possibili"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
@@ -2337,8 +2397,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Caricare"
 
@@ -2347,11 +2407,13 @@ msgstr "Caricare"
 msgid "Download"
 msgstr "Scarica"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
-msgstr "Impossibile salvare la foto dell'utente, Fusiondirectory necessita che il modulo PHP \"imagick\" sia installato "
+msgstr ""
+"Impossibile salvare la foto dell'utente, Fusiondirectory necessita che il "
+"modulo PHP \"imagick\" sia installato "
 
 #: include/simpleplugin/attributes/class_SetAttribute.inc:136
 #, php-format
@@ -2398,27 +2460,10 @@ 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/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr "C'é stato un problema nella decompressione dei dati di snapshot"
 
-#: include/class_plugin.inc:809
-#, 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 "La dipendenza riccorsiva nei campi di modello: \"%1$s\" non puo' dipendere da \"%2$s\" dato che \"%2$s\" dipende già da \"%1$s\""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr "Servizio \"%s\""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Tab \"%s\""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2437,7 +2482,10 @@ msgstr "Ruoli ACL"
 msgid ""
 "Unkown ACL type '%s'!\n"
 "You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
-msgstr "Tipo '%s'! ACL sconosciuto! Potrebbe seere necessario eseguire \"fusiondirectory-impostazione --migrare-acls\" per migrare gli ACL verso un nuovo formato."
+msgstr ""
+"Tipo '%s'! ACL sconosciuto! Potrebbe seere necessario eseguire "
+"\"fusiondirectory-impostazione --migrare-acls\" per migrare gli ACL verso un"
+" nuovo formato."
 
 #: include/class_acl.inc:170
 #, php-format
@@ -2449,14 +2497,19 @@ msgstr "Voce '%s' sconosciuta !"
 msgid "All users"
 msgstr "Tutti gli utenti"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Applica filtro"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "La cartella '%s' dichiarata come cartella di compilazione è inaccessibile !"
+msgstr ""
+"La cartella '%s' dichiarata come cartella di compilazione è inaccessibile !"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2467,14 +2520,18 @@ msgstr "Attenzione: la sessione  <a href=\"%s\"> non é crittografata!</a>"
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
-msgstr "Attenzione: la durata della sessione configurata nel fusiondirectory.conf verrà sostituita dalle impostazioni di php.ini."
+msgstr ""
+"Attenzione: la durata della sessione configurata nel fusiondirectory.conf "
+"verrà sostituita dalle impostazioni di php.ini."
 
 #: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "La configurazione %s/%s di FusionDirectory non è leggibile. Esegui fusiondirectory-setup --check-config per risolvere questo problema."
+msgstr ""
+"La configurazione %s/%s di FusionDirectory non è leggibile. Esegui "
+"fusiondirectory-setup --check-config per risolvere questo problema."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2483,7 +2540,9 @@ msgstr "Errore Smarty"
 #: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
-msgstr "Il directory \"%s\" specificato come directory di compilazione non é accessibile!"
+msgstr ""
+"Il directory \"%s\" specificato come directory di compilazione non é "
+"accessibile!"
 
 #: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
@@ -2522,45 +2581,43 @@ msgstr "Prego specifica la tua password !"
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Nessun valore trovato nell'header HTTP \"%s\""
 
-#: html/index.php:476
+#: html/index.php:470
 #, 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:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
-msgstr "L'utente header \"%s\" corrisponde a più utenti in LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
+msgstr "L'accesso con utente \"%s\" ha innescato l'errore: %s"
 
-#: html/index.php:548
+#: html/index.php:537
 #, 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:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr "L'utente CAS \"%s\" corrisponde a più utenti nell'annuario LDAP"
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Il tuo navigatore web ha i cookies disattivati. Attiva i cookies e ricarica la pagina prima di connetterti !"
+msgstr ""
+"Il tuo navigatore web ha i cookies disattivati. Attiva i cookies e ricarica "
+"la pagina prima di connetterti !"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
+msgstr ""
+"Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
 
 #: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
@@ -2589,19 +2646,25 @@ msgstr "Ci sono più account che usano l'indirizzo mail %s"
 #: html/class_passwordRecovery.inc:518
 #, 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."
+msgstr ""
+"L'utente che usa la mail \"%s\" é bloccato. Si prega di contattare "
+"l'amministratore di sistema."
 
 #: html/class_passwordRecovery.inc:573
 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"
+msgstr ""
+"Contattare l'amministratore, c'è stato un problema con il server di posta "
+"elettronica"
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 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 è stata inviata"
+msgstr ""
+"Si è verificato un problema con il server mail, la email di conferma non è "
+"stata inviata"
 
 #: html/main.php:115
 msgid "PHP configuration"
@@ -2611,7 +2674,9 @@ msgstr "Configurazione PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Errore fatale: Register globals è attivato. FusionDirectory rifiuterà ogni accesso utente finchè questo errore non sarà corretto da un amministratore."
+msgstr ""
+"Errore fatale: Register globals è attivato. FusionDirectory rifiuterà ogni "
+"accesso utente finchè questo errore non sarà corretto da un amministratore."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2642,7 +2707,9 @@ msgstr "Estensione"
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
-msgstr "Errore fatale: Impossibile trovare alcuna definizione per il plugin '%s' ('%s' non è un file)!"
+msgstr ""
+"Errore fatale: Impossibile trovare alcuna definizione per il plugin '%s' "
+"('%s' non è un file)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
@@ -2653,7 +2720,9 @@ msgstr "Errore di configurazione"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Errore fatale: non tutte le variabili POST sono state trasferite da PHP - per favore informane l'amministratore!"
+msgstr ""
+"Errore fatale: non tutte le variabili POST sono state trasferite da PHP - "
+"per favore informane l'amministratore!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2666,225 +2735,8 @@ msgstr "Benvenuto %s!"
 msgid "References"
 msgstr "Riferimenti"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Modifica le impostazioni POSIX dell'utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Home directory"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Il path verso la cartella personale di questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Quale shell dovrà essere usata quando l'utente sarà connesso"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Gruppo primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Gruppo primario per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Stato di questo account utente unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Forza l'id utente/gruppo"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Forza valori ID utente e ID gruppo per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "Utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Valore utente per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "numero del Gruppo"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Valore del numero del gruppo per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Gruppi di appartenenza"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Account"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "L'utente dovrà cambiare la password alla prima connessione"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "L'utente deve cambiare password al primo login (serve un valore di ritardo prima di forzare il cambio password)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr "Lasso di tempo minimo tra le modifiche delle password (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr "L'utente non sarà in grado di cambiare la propria password prima di questo numero di giorni (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Richiamo prima dell'obbligo di modifica della password (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "L'utente sarà obbligato di cambiare la sua password dopo questo numero di giorni (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Data di scadenza della password"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Data dopo la quale questa password utente scadrà (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Periodo di inattività prima della disattivazione dell'account utente (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Ritardo massimo di inattività dopo la scadenza della password prima che l'utente venga disabilitato (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Richiamo per l'utente prima che la password scada (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "L'utente sarà avvertito questo numero di giorni prima della scadenza della sua password (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Sistema di fiducia"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Modalità di fiducia"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Tipo di autorizzazione per questi host"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "disattivato"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "accesso completo"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "autorizza l'accesso a questi host"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automatico"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "Scaduto"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Il tempo di grazia è attivo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "Attivo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "Password scaduta"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "Password non modificabile"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Il tempo d'attesa per il blocco è scaduto. Blocco ignorato !"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Gruppo di utenti %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Gruppi e ruoli"
 
@@ -2911,7 +2763,7 @@ 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:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2932,278 +2784,300 @@ msgstr "Ripeti password"
 msgid "Same password as above, to avoid errors"
 msgstr "Stessa password come sopra, per evitare errori"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Utente"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Informazioni account utente"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Account utente"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr "Stato di blocco utente"
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Cognome utente"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Nme utente"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Breve descrizione dell'utente"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Foto"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Avatar di questo utente"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Informazioni di contatto organizzativo"
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Località"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Regione"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Indirizzo"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Indirizzo postale ufficio"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Numero dell'ufficio"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefono"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Telefono ufficio"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Telefono cellulare professionale"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Numero pager ufficio"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Numero fax ufficio"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Pagina Web personale"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Informazioni account utente"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Login utente"
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Password dell'utente"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Informazioni personali utente"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Mostra il nome"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 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:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Indirizzo di casa"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Indirizzo postale di casa"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Numero di telefono privato"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Numero di telefono di casa"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titolo"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
-msgstr "Titolo di una persona nel proprio contesto organizzativo. Ogni titolo è una valore di questo attributo multivalore"
+msgstr ""
+"Titolo di una persona nel proprio contesto organizzativo. Ogni titolo è una "
+"valore di questo attributo multivalore"
 
-#: plugins/personal/generic/class_user.inc:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:428
+#: 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:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Numero del dipartimento"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Matricola No."
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Matricola dell'impiegato"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Manager"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr "Via"
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr "Parte dell'indirizzo Via"
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr "Casella postale"
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "CAP"
+
+#: plugins/personal/generic/class_user.inc:659
 #, 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:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Non le é permesso cambiare la propria password"
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, 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:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "La password si trova nella cronologia delle vecchie password"
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "La password non è stata cambiata dal valore esistente"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
-msgstr "Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova password\" non corrispondono."
+msgstr ""
+"Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova "
+"password\" non corrispondono."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Imposta la nuova password"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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."
+msgstr ""
+"La password che hai definito come 'Nuova password' è troppo simile a quella "
+"attuale."
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "La 'Nuova password' immessa è troppo corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr "La password utilizzata come nuova è troppo breve."
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La password contiene caratteri Unicode eventualmente problematici!"
 
@@ -3299,7 +3173,9 @@ msgstr "Stringa aleatoria per il tokens"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Solo una misura di sicurezza, potete mettere qualsiasi cosa dentro, anche dei caratteri casuali"
+msgstr ""
+"Solo una misura di sicurezza, potete mettere qualsiasi cosa dentro, anche "
+"dei caratteri casuali"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3309,17 +3185,21 @@ msgstr "Consentire l'uso di indirizzi alternativi"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Gli utenti possono usare uno dei loro indirizzi email alternativi per il recupero della loro password"
+msgstr ""
+"Gli utenti possono usare uno dei loro indirizzi email alternativi per il "
+"recupero della loro password"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Attributo di connessione"
 
 #: plugins/config/class_recoveryConfig.inc:78
 msgid ""
 "Usually uid, but you can use something else for instance in case of SSO"
-msgstr "Di solito UID, ma è possibile utilizzare qualcos'altro per esempio in caso di SSO"
+msgstr ""
+"Di solito UID, ma è possibile utilizzare qualcos'altro per esempio in caso "
+"di SSO"
 
 #: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
@@ -3348,7 +3228,9 @@ msgstr "Corpo del messaggio (il primo %s è il login, il secondo è il link)"
 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 "Corpo del messaggio della prima email, inviata quando l'utente chiede una nuova password. %s è usato per il login utente e il link di recupero."
+msgstr ""
+"Corpo del messaggio della prima email, inviata quando l'utente chiede una "
+"nuova password. %s è usato per il login utente e il link di recupero."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3360,7 +3242,16 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr "Buongiorno,\n\necco le votre informazioni:\n- Login : %s\n\n- Link : %s\n\n\nQuesto link é valido solo per 10 minuti."
+msgstr ""
+"Buongiorno,\n"
+"\n"
+"ecco le votre informazioni:\n"
+"- Login : %s\n"
+"\n"
+"- Link : %s\n"
+"\n"
+"\n"
+"Questo link é valido solo per 10 minuti."
 
 #: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
@@ -3372,7 +3263,8 @@ msgstr "Soggetto della seconda email"
 
 #: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
-msgstr "[FusionDirectory] Il recupero della password è stato eseguito con successo"
+msgstr ""
+"[FusionDirectory] Il recupero della password è stato eseguito con successo"
 
 #: plugins/config/class_recoveryConfig.inc:114
 #, php-format
@@ -3384,7 +3276,9 @@ msgstr "Corpo del messaggio (%s è il login utente)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Corpo del messaggio della seconda email, inviata per confermare la modifica della password. %s è usato per il login dell'utente."
+msgstr ""
+"Corpo del messaggio della seconda email, inviata per confermare la modifica "
+"della password. %s è usato per il login dell'utente."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3393,7 +3287,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Salve,\n\nLa tua password è stata modificata.\nIl tuo login è sempre %s."
+msgstr ""
+"Salve,\n"
+"\n"
+"La tua password è stata modificata.\n"
+"Il tuo login è sempre %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3421,7 +3319,10 @@ msgstr "Lingua"
 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 "Linguaggio dell'applicazione. Se 'automatico' oppure non disponibile, verrà usato quello richiesto dal browser. Questa impostazione puó essere ridefinita per utente."
+msgstr ""
+"Linguaggio dell'applicazione. Se 'automatico' oppure non disponibile, verrà "
+"usato quello richiesto dal browser. Questa impostazione puó essere "
+"ridefinita per utente."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3440,527 +3341,501 @@ msgid "Timezone to be used"
 msgstr "Fuso orario da usare"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Impostazione schema"
+msgid "Core settings"
+msgstr "Impostazioni di base"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Dimensione massima dell'annuario LDAP"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Definisce il numero di voci ottenibili da LDAP come impostazione "
+"predefinita."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Blocco modifica"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Controlla se una voce attualmente in fase di modifica è stata modificata al "
+"di fuori di FusionDirectory nel frattempo."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Attiva il debugging"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Log degli eventi dal lato di FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr "Convalida dello schema"
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Attivare la validazione degli schemi alla connessione"
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Attiva le copie istantanee"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Questo abilita la possibilità di salvare alcuni stati delle entrate per "
+"poterle in seguito restaurare"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base per le copie istantanee"
+
+#: plugins/config/class_configInLdap.inc:141
+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
 msgid "Password settings"
 msgstr "Impostazioni per la password"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Algoritmo di memorizzazione delle password"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Algoritmo di default da usare"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Forza l'algoritmo di default"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 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:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Lunghezza minima per le password"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Lunghezza minima per le password utente"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Differenze minime della password"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Numero minimo di caratteri diversi rispetto alla  vecchia password"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Utilizza una scadenza per l'account"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
-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:148
-msgid "SASL Realm"
-msgstr "SASL Realm"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr "SASL Exop"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr "Attributo da salvare nell'attributo userPassword"
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Impostazioni di base"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Mostra il riepilogo negli elenchi"
-
-#: plugins/config/class_configInLdap.inc:162
-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 "Determina se una barra di stato verrà visualizzata nella parte inferiore delle liste, visualizzando una breve sintesi del tipo e del numero di elementi nella lista."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Blocco modifica"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Controlla se una voce attualmente in fase di modifica è stata modificata al di fuori di FusionDirectory nel frattempo."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Attiva il debugging"
+"forces password renewal or account locking"
+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:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Log degli eventi dal lato di FusionDirectory."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
+msgstr "SASL Realm"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Dimensione massima dell'annuario LDAP"
+msgid "SASL Exop"
+msgstr "SASL Exop"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Definisce il numero di voci ottenibili da LDAP come impostazione predefinita."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr "Attributo da salvare nell'attributo userPassword"
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Connessione e sessione"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 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."
+msgstr ""
+"Quale attributo LDAP deve essere utilizzato come nome di login durante il "
+"login."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forza le connessioni criptate"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Abilita i controlli di sicurezza PHP per forzare l'accesso cifrato (https) verso l'interfaccia web."
+msgstr ""
+"Abilita i controlli di sicurezza PHP per forzare l'accesso cifrato (https) "
+"verso l'interfaccia web."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Mostra un avvertimento quando la sessione non è criptata"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 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."
+msgstr ""
+"verrà visualizzato un avvertimento all'utente quando si utilizza http invece"
+" di https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Durata di vita della sessione"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 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:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr "Autentificazione HTTP Basic"
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
-msgstr "Usa protocollo di autenticazione HTTP Basic anziché il modulo di login."
+msgstr ""
+"Usa protocollo di autenticazione HTTP Basic anziché il modulo di login."
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr "Autenticazione HTTP Header"
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 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:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr "Nome intestazione"
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr "Nome dell'header contenente identificativo utente."
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Attiva le copie istantanee"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Questo abilita la possibilità di salvare alcuni stati delle entrate per poterle in seguito restaurare"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base per le copie istantanee"
-
-#: plugins/config/class_configInLdap.inc:237
-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:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Percorso della chiave"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr "Percorso a chiave privata FusionDirectory . Inutilizzato per ora."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Percorso del Certificato"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Percorso al certificato di FusionDirectory;  Inutilizzato per ora."
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Percorso del certificato CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 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."
+msgstr ""
+"Percorso al certificato CA. Usato per convalidare l'host del Server "
+"Argonaut."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Abilita CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 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:272
+#: plugins/config/class_configInLdap.inc:256
 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:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr "Host del server CAS"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Porta"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr "Porta sulla quale il server CAS è all'ascolto"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr "Contesto CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr "Contesto CAS da utilizzare"
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
-msgstr "Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i gruppi"
+msgstr ""
+"Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i "
+"gruppi"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Tipo di attributo DN degli utenti"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 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:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Modello CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 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:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Regola di denominazione rigorosa"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 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:314
-msgid "Group/user min id"
-msgstr "Gruppo/utente minimo ID"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr "Il minimo utente o grupp ID assegnabile per evitare perdite di sicurezza con iaccount ID 0."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Id hook successivo"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr "Script da nominare per trovare il prossimo numero ID libero per gli utenti o i gruppi."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Numero base per questo ID utente"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Dove cominciare a cercare un nuovo id libero per un utente."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Numero base per questo id gruppo"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Dove cominciare a cercare un nuovo id libero per un gruppo ."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "RDN utenti"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Ramo nel quale gli utenti sono immagazzinati"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "RDN gruppi"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Il ramo nel quale i gruppi saranno immagazzinati."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Ruolo ACL RDN"
 
-#: plugins/config/class_configInLdap.inc:346
+#: 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:351
-msgid "Id allocation method"
-msgstr "Metodo di assegnazione Id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Metodo per allocare utente / gruppo id"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradizionale"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Id del pool di Samba unix"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Minimo pool id dell'utente"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Valore minimo di un id utente quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Id utente pool max"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Valore massimo di un id utente quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Id utente pool min"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Valore minimo di un id gruppo quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Id gruppo pool min"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Valore massimo di un id gruppo quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Limitare i membri del ruolo"
 
-#: plugins/config/class_configInLdap.inc:377
+#: 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 "Quando è abilitato solo gli utenti dello stesso ramo o membri di gruppi dello stesso ramo possono essere aggiunti ad un ruolo."
+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:317
+msgid "Separate address fields"
+msgstr "Campi indirizzi separati"
 
-#: plugins/config/class_configInLdap.inc:383
+#: 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:321
+msgid "Postal address pattern"
+msgstr "Modello indirizzo postale"
+
+#: plugins/config/class_configInLdap.inc:321
+msgid ""
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
+msgstr ""
+"Quando si utilizzano campi di indirizzi separati, è possibile utilizzare un "
+"modello per riempire il campo postalAddress."
+
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Mostra gli errori"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "Mosta gli errori PHP nella parte alta della schermata. Questo dovrebbe essere disabilitato nelle installazioni di produzione, a causa di possibili password che potrebbero passare in chiaro."
+msgstr ""
+"Mosta gli errori PHP nella parte alta della schermata. Questo dovrebbe "
+"essere disabilitato nelle installazioni di produzione, a causa di possibili "
+"password che potrebbero passare in chiaro."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Durata massima di una richiesta LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Interrompi le azioni LDAP se non ci sono risposte nel tempo limite impartito in secondi."
+msgstr ""
+"Interrompi le azioni LDAP se non ci sono risposte nel tempo limite impartito"
+" in secondi."
 
-#: plugins/config/class_configInLdap.inc:396
+#: 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:397
+#: 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 "Invia le statistiche di timing LDAP al syslog. Questo può aiutare a trovare i problemi di indicizzazione o i filtri di ricerca erronei."
+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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Livello per il debug"
 
-#: plugins/config/class_configInLdap.inc:403
+#: 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:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Altro"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Mostra il riepilogo negli elenchi"
+
+#: 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 ""
+"Determina se una barra di stato verrà visualizzata nella parte inferiore "
+"delle liste, visualizzando una breve sintesi del tipo e del numero di "
+"elementi nella lista."
+
+#: 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:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+"Per l'impostazione di diritti ACL molto specifici potreste aver bisogno di "
+"dare accesso ad un singolo oggetto."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr "Categorie di reparto disponibili"
+
+#: 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: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:385
+msgid "Group or role"
+msgstr "Gruppo o ruolo"
+
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
+msgstr "PLugin per la lista nera"
+
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
+msgstr "Lista nera del menu Plugin"
+
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Connessioni"
+
+#: 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:424
-msgid "tab"
-msgstr "tab"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
+msgstr "Tab"
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:414
 msgid "The tab that this hook concerns"
 msgstr "Il tab concernente questo hook"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr "Modalità"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:419
 msgid "When to call this command"
 msgstr "Quando chiamare questo comando"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "comando"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
+msgstr "Comando"
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:426
 msgid "The command that will be called"
 msgstr "Il comando che sarà chiamato"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Connessioni"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:440
 msgid "Display hook output"
 msgstr "Mostra hook di uscita"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:441
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
-msgstr "Quando l'esecuzione dell'hook é abilitata con successo il risultato é mostrato all'utente tramite una finestra di dialogo."
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Shell disponibili"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Shell POSIX disponibili per gli utenti FD"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr "Shell di default"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr "Shell utilizzato per impostazione predefinita durante l'attivazione scheda Unix."
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Mostra tab ACL su tutti gli oggetti"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr "Per l'impostazione di diritti ACL molto specifici potreste aver bisogno di dare accesso ad un singolo oggetto."
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr "Categorie di reparto disponibili"
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr "Categorie disponibili nel menu a discesa"
+msgstr ""
+"Quando l'esecuzione dell'hook é abilitata con successo il risultato é "
+"mostrato all'utente tramite una finestra di dialogo."
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
@@ -4002,7 +3877,9 @@ msgstr "Obbligare a chiedere la password"
 msgid ""
 "Useful if you add a hook using password value when SASL user passwords are "
 "edited"
-msgstr "Utile se si aggiunge un gancio con valore di password quando le password degli utenti SASL vengono modificate"
+msgstr ""
+"Utile se si aggiunge un gancio con valore di password quando le password "
+"degli utenti SASL vengono modificate"
 
 #: plugins/config/class_dashBoardConfig.inc:28
 msgid "Dashboard configuration"
@@ -4044,7 +3921,9 @@ msgstr "Numero di giorni"
 msgid ""
 "Number of days before expiration needed for an account to show in the "
 "dashboard next expired accounts list"
-msgstr "Numero di giorni prima della scadenza necessari per un account per mostrare nel dashboard la prossima scadenza degli account"
+msgstr ""
+"Numero di giorni prima della scadenza necessari per un account per mostrare "
+"nel dashboard la prossima scadenza degli account"
 
 #: plugins/admin/departments/class_department.inc:34
 #: plugins/admin/departments/class_department.inc:35
@@ -4058,9 +3937,8 @@ msgstr "dipartimento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4146,7 +4024,9 @@ msgstr "Gestisci i dipartimenti"
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
-msgstr "Gestire i reparti, i paesi, i componenti di dominio, i domini, le località e le note di organizzazione,"
+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
 msgid "Users and groups"
@@ -4188,22 +4068,24 @@ 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:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Blocco dell'account"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
-msgstr "La metodologia password \"%s\"  non sopporta il blocco. L'account \"%s\" non é stato bloccato!"
+msgstr ""
+"La metodologia password \"%s\"  non sopporta il blocco. L'account \"%s\" non"
+" é stato bloccato!"
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Sblocca l'account"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Blocca l'account"
 
@@ -4249,7 +4131,7 @@ msgstr "Elimina utente"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4269,8 +4151,7 @@ msgid "Information"
 msgstr "Informazione"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Nome del gruppo"
 
@@ -4294,128 +4175,149 @@ msgstr "Membri del ruolo"
 msgid "Add users for the role"
 msgstr "Aggiungi degli utenti per il ruolo"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Gestione dei gruppi e dei ruoli"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr "Vi permette di gestire gruppi di oggetti, gruppi e ruoli POSIX"
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Modifica le proprietà del ruolo"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Modifica le proprietà posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Mostra i gruppi di utenti"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostra i gruppi principali"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Mostra i ruoli organizzativi"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Mostra i gruppi di applicazioni"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr "Mostra gruppi non identificati"
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostra i gruppi principali"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: 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:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostra i gruppi samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr "Mostra voci DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Mostra i gruppi di servers"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Mostra i gruppi di workstations"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Mostra i gruppi"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Mostra i gruppi di terminali"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Mostra i gruppi di stampanti"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Mostra i gruppi di telefoni"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Tipo sconosciuto : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Non esiste il dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Informazioni gruppo di oggetti"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Breve descrizione del gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Oggetti membri"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Oggetti membro di questo gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema di fiducia"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modalità di fiducia"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Tipo di autorizzazione per questi host"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "disattivato"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "accesso completo"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "autorizza l'accesso a questi host"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 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:322
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
@@ -4424,35 +4326,6 @@ msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
 msgid "List of groups"
 msgstr "Elenco dei gruppi"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "Informazioni gruppo POSIX"
-
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "Gruppo POSIX"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr "Gruppo utenti POSIX"
-
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forza il GID"
-
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "Forzare il valore GID per questo gruppo"
-
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
-msgstr "Valore GID per questo gruppo"
-
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Membri del gruppo"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4500,10 +4373,6 @@ msgstr "Assegnazione Dialog ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Gestione della lista di controllo degli accessi"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modalità"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Si applica ad una sottostruttura completa oppure soltanto alla base?"
@@ -4681,7 +4550,9 @@ msgstr "Crea un nuovo account amministratore di FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Questa finestra ti permette di aggiungere automaticamente un super-amministratore al tuo albero LDAP."
+msgstr ""
+"Questa finestra ti permette di aggiungere automaticamente un super-"
+"amministratore al tuo albero LDAP."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4696,7 +4567,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Sembra che sia la prima volta che avvii FusionDirectory - per il momento non trovo nessun file di configurazione. Questo assistente ti potrà aiutare durante la fase di configurazione."
+msgstr ""
+"Sembra che sia la prima volta che avvii FusionDirectory - per il momento non"
+" trovo nessun file di configurazione. Questo assistente ti potrà aiutare "
+"durante la fase di configurazione."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4708,7 +4582,8 @@ msgstr "Crea una semplice configurazione mono sito"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr "Prova a vedere se ci sono dei problemi nella configurazione di PHP o di LDAP"
+msgstr ""
+"Prova a vedere se ci sono dei problemi nella configurazione di PHP o di LDAP"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
@@ -4739,7 +4614,10 @@ msgid ""
 "For security reasons you need to authenticate for the installation by "
 "creating the file '%1', containing the current session ID on the servers "
 "local filesystem. This can be done by executing the following command:"
-msgstr "Per motivi di sicurezza é necessario autenticarsi per l' installazione creando il file ' % 1 ', contenente l'ID di sessione corrente sui server filesystem locale. Questo può essere fatto eseguendo il comando seguente :"
+msgstr ""
+"Per motivi di sicurezza é necessario autenticarsi per l' installazione "
+"creando il file ' % 1 ', contenente l'ID di sessione corrente sui server "
+"filesystem locale. Questo può essere fatto eseguendo il comando seguente :"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -4749,13 +4627,11 @@ msgstr "Premi il bottone 'Continua' quando avrai finito."
 msgid "Add required object classes to the LDAP base"
 msgstr "Aggiungi la classe di oggetto richiesta alla base LDAP"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Attuale"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Dopo la migrazione"
 
@@ -4763,58 +4639,74 @@ msgstr "Dopo la migrazione"
 msgid "Close"
 msgstr "Chiuso"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Durante l'ispezione LDAP, analizzeremo i problemi classici che possono "
+"sopraggiungere durante la migrazione verso un sistema d'amministratione "
+"basato su FusionDirectory. Potrai correggere i seguenti errori al fine di "
+"procurarti una facile amministrazione del sistema."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Verifica di nuovo"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
-msgstr "Questa finestra di dialogo consente di spostare un paio di voci nell'albero configurato. In questo modo si può raddrizzare il servizio LDAP ."
+msgstr ""
+"Questa finestra di dialogo consente di spostare un paio di voci nell'albero "
+"configurato. In questo modo si può raddrizzare il servizio LDAP ."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
-msgstr "Fate attenzione con questa opzione! Ci possono essere riferimenti che puntano a queste voci . Il setup di FusionDirectory non puo' migrare i riferimenti, di conseguenza potreste voler annullare la migrazione in questo caso."
+msgstr ""
+"Fate attenzione con questa opzione! Ci possono essere riferimenti che "
+"puntano a queste voci . Il setup di FusionDirectory non puo' migrare i "
+"riferimenti, di conseguenza potreste voler annullare la migrazione in questo"
+" caso."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Sposta gli utenti selezionati in questo ramo"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
-msgstr "Le voci listate sono al momento invisibili nell'interfaccia di FusionDirectory. Se desiderate cambiare questo solo per un paio di voci, selezionatele e usate il tasto \"Migrare\" qui di seguito."
+msgstr ""
+"Le voci listate sono al momento invisibili nell'interfaccia di "
+"FusionDirectory. Se desiderate cambiare questo solo per un paio di voci, "
+"selezionatele e usate il tasto \"Migrare\" qui di seguito."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Se vuoi sapere cosa sarà fatto quando migrerai le \"entries\" selezionate, usa il bottone \"Mostra i cambiamenti\" qui sotto, per vedere il file LDIF."
+msgstr ""
+"Se vuoi sapere cosa sarà fatto quando migrerai le \"entries\" selezionate, "
+"usa il bottone \"Mostra i cambiamenti\" qui sotto, per vedere il file LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Mostra le modifiche"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Durante l'ispezione LDAP, analizzeremo i problemi classici che possono sopraggiungere durante la migrazione verso un sistema d'amministratione basato su FusionDirectory. Potrai correggere i seguenti errori al fine di procurarti una facile amministrazione del sistema."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Verifica di nuovo"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Crea il file di configurazione"
 
 #: setup/setup_finish.tpl.c:5
 msgid "Run %1 to put the correct right on fusiondirectory.conf"
-msgstr "Eseguire %1 per mettere le giuste autorizzazioni su fusiondirectory.conf "
+msgstr ""
+"Eseguire %1 per mettere le giuste autorizzazioni su fusiondirectory.conf "
 
 #: setup/setup_finish.tpl.c:8
 msgid "Download configuration"
@@ -4836,7 +4728,9 @@ msgstr "Password dimenticata"
 
 #: ihtml/themes/breezy/recovery.tpl.c:11
 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"
+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
 msgid "Warning : this email is only valid for %1 minutes."
@@ -4846,7 +4740,10 @@ msgstr "Attenzione: questa e-mail é valida soltanto per %1 minuti."
 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'."
+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
@@ -4883,13 +4780,17 @@ msgstr "La tua password è stata modificata."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante 'Modifica'"
+msgstr ""
+"Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante "
+"'Modifica'"
 
 #: ihtml/themes/breezy/recovery.tpl.c:62
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
-msgstr "=> Usa la tua e-mail nel formato lungo, per es.: John Doe => john.doe@example.com"
+msgstr ""
+"=> Usa la tua e-mail nel formato lungo, per es.: John Doe => "
+"john.doe@example.com"
 
 #: ihtml/themes/breezy/recovery.tpl.c:74
 msgid "Email"
@@ -4899,7 +4800,9 @@ msgstr "Indirizzo di posta elettronica"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "Il recupero della password non è attivato. Se hai perso la tua password, contatta il tuo amministratore di rete."
+msgstr ""
+"Il recupero della password non è attivato. Se hai perso la tua password, "
+"contatta il tuo amministratore di rete."
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4909,7 +4812,9 @@ msgstr "Schermata di connessione"
 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."
+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
@@ -4934,7 +4839,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "L'opzione \"dimensione massima\" rende les operationi LDAP più veloci e permette di alleggerire il carico di lavoro del server LDAP. La maniera più semplice di gestire enormi basi di dati senza avere lunghi tempi d'attesa è quella di limitare la ricerca a dei piccoli valori e di utilizzare i filtri per ottenere i valori ricercati."
+msgstr ""
+"L'opzione \"dimensione massima\" rende les operationi LDAP più veloci e "
+"permette di alleggerire il carico di lavoro del server LDAP. La maniera più "
+"semplice di gestire enormi basi di dati senza avere lunghi tempi d'attesa è "
+"quella di limitare la ricerca a dei piccoli valori e di utilizzare i filtri "
+"per ottenere i valori ricercati."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4942,13 +4852,17 @@ msgstr "Scegli il modo di reagire per questa sessione"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignora questo errore e mostra tutte le voci restituite dal server LDAP"
+msgstr ""
+"ignora questo errore e mostra tutte le voci restituite dal server LDAP"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignora questo errore e mostra tutte le voci che rientrano nel sizelimit definito e lasciami invece utilizzare i filtri per limitare i dati da visualizzare "
+msgstr ""
+"ignora questo errore e mostra tutte le voci che rientrano nel sizelimit "
+"definito e lasciami invece utilizzare i filtri per limitare i dati da "
+"visualizzare "
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4963,12 +4877,16 @@ msgstr "Attenzione! Stai per cancellare i seguenti oggetti"
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per"
+" interrompere."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -4993,12 +4911,15 @@ msgstr "Attenzione! Stai per cancellare i seguenti oggetti"
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:5
 msgid "Any modification made to the object since this snapshot will be lost."
-msgstr "Qualsiasi modifica apportata all'oggetto da questa istantanea sarà persa."
+msgstr ""
+"Qualsiasi modifica apportata all'oggetto da questa istantanea sarà persa."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:11
 msgid ""
 "So - if you're sure - press 'Continue' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Continua' per continuare oppure 'Annulla' per interrompere."
+msgstr ""
+"Quindi - se sei sicuro - premi 'Continua' per continuare oppure 'Annulla' "
+"per interrompere."
 
 #: ihtml/themes/breezy/restore-confirm.tpl.c:14
 #: ihtml/themes/breezy/template.tpl.c:8
@@ -5018,7 +4939,10 @@ 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 "Se questo conflitto di chiusura è falso, un'altra persona potrebbe aver chiuso il navigatore web durante un'operazione di inserimento dati. In questo caso puoi togliere il blocco premendo il tasto \"%1\"."
+msgstr ""
+"Se questo conflitto di chiusura è falso, un'altra persona potrebbe aver "
+"chiuso il navigatore web durante un'operazione di inserimento dati. In "
+"questo caso puoi togliere il blocco premendo il tasto \"%1\"."
 
 #: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
@@ -5028,7 +4952,10 @@ msgstr "Solo lettura"
 msgid ""
 "This may be used by several groups. Please double check if you really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr "Questo puo' essere utilizzato da diversi gruppi. Si prega di controllare due volte se si vuole veramente fare questo in quanto non vi è alcun modo per FusionDirectory per ottenere di nuovo i vostri dati."
+msgstr ""
+"Questo puo' essere utilizzato da diversi gruppi. Si prega di controllare due"
+" volte se si vuole veramente fare questo in quanto non vi è alcun modo per "
+"FusionDirectory per ottenere di nuovo i vostri dati."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:2
 msgid "Copy & paste wizard"
@@ -5039,17 +4966,25 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Alcuni valori devono essere univoci nella directory completa, mentre alcune combinazioni non hanno senso. FusionDirectory mostra i valori corrispondenti. Mantieni i valori qui sotto per soddisfare i criteri di sicurezza."
+msgstr ""
+"Alcuni valori devono essere univoci nella directory completa, mentre alcune "
+"combinazioni non hanno senso. FusionDirectory mostra i valori "
+"corrispondenti. Mantieni i valori qui sotto per soddisfare i criteri di "
+"sicurezza."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Ricorda che certe propietà, come fare una 'copia instantanea', non saranno copiate!"
+msgstr ""
+"Ricorda che certe propietà, come fare una 'copia instantanea', non saranno "
+"copiate!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Oppure se copi o tagli una voce con FusionDirectory e poi ne cancelli l'origine, potrai incorrere in errori tentando di incollarla di nuovo!"
+msgstr ""
+"Oppure se copi o tagli una voce con FusionDirectory e poi ne cancelli "
+"l'origine, potrai incorrere in errori tentando di incollarla di nuovo!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5115,7 +5050,9 @@ msgstr "< strong> % 1 < / strong> referenze < strong> % 3 < / strong>"
 msgid ""
 "<strong>%1</strong> references our field <strong>%3</strong> from tab "
 "<strong>%2</strong>"
-msgstr "<strong>%1</strong> referenze nostro campo <strong>%3</strong> dalla scheda <strong>%2</strong>"
+msgstr ""
+"<strong>%1</strong> referenze nostro campo <strong>%3</strong> dalla scheda "
+"<strong>%2</strong>"
 
 #: plugins/generic/references/contents.tpl.c:8
 msgid "This object has no relationship to other objects."
@@ -5157,18 +5094,20 @@ msgstr "L'algoritmo della tua password non puó essere cambiato !"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Hai cambiato con successo la tua password. Ricorda di modificare tutti i programmmi configurati per usarla."
+msgstr ""
+"Hai cambiato con successo la tua password. Ricorda di modificare tutti i "
+"programmmi configurati per usarla."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
 msgid_plural "There are %1 groups:"
 msgstr[0] "C'é 1 gruppo:"
-msgstr[1] "Ci sono %1 gruppi:"
+msgstr[1] "Vi sono %1 gruppi:"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] "Uno di essi é un gruppo %1 "
+msgstr[0] "Uno di essi é un gruppo %1"
 msgstr[1] "%2 sono %1 gruppi"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:8
@@ -5179,14 +5118,14 @@ msgstr "Non c'é alcun gruppo %1"
 #: plugins/addons/dashboard/pwd_stats.tpl.c:2
 msgid "There is 1 user:"
 msgid_plural "There are %1 users:"
-msgstr[0] "C'é un utente"
+msgstr[0] "C'é 1 utente:"
 msgstr[1] "Ci sono %1 utenti:"
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-msgstr[0] "Uno di essi ha un account %1"
-msgstr[1] "%2 di essi hanno %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
 msgid "None of them have a %1 account"
@@ -5195,14 +5134,14 @@ msgstr "Nessuno di essi ha %1 di account"
 #: 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] "Uno di essi usa il metodo %1"
-msgstr[1] "%2 di essi usa il metodo %1"
+msgstr[0] "Uno di essi usa %1  metodo"
+msgstr[1] "%2 di essi usano %1 metodo"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:8
 msgid "One of them is locked"
 msgid_plural "%1 of them are locked"
-msgstr[0] "L'1% di essi sono bloccati"
-msgstr[1] "L'1% di essi sono bloccati"
+msgstr[0] "Uno di essi é bloccato"
+msgstr[1] "%1 di essi sono bloccati"
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
@@ -5212,7 +5151,7 @@ msgstr "Nessuno di loro è bloccato"
 msgid "There is one expired account"
 msgid_plural "There are %1 expired accounts"
 msgstr[0] "C'é un account scaduto"
-msgstr[1] "Ci sono %1 di accounts scaduti"
+msgstr[1] "Ci sono %1 account scaduti"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:5
 msgid "There is no expired account"
@@ -5258,8 +5197,8 @@ msgstr "mail"
 #: plugins/addons/dashboard/users_accounts.tpl.c:35
 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] "C'é un account in scadenza nei prossimi 1% giorni "
-msgstr[1] "Ci sono %2 di accounts in scadenza nei prossimi 1% giorni "
+msgstr[0] "C'é un account in scadenza nei prossimi %1 giorni"
+msgstr[1] "Ci sono %2 accounts in scadenza nei prossimi %1 giorni"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:38
 msgid "There is no account expiring in the next %1 days"
@@ -5293,13 +5232,17 @@ msgstr "Mostra gli utenti di Samba"
 msgid ""
 "Warning: you are about to delete the ACL assignments on the following "
 "objects"
-msgstr "Attenzione: si sta per cancellare le assegnazioni ACL sui seguenti oggetti"
+msgstr ""
+"Attenzione: si sta per cancellare le assegnazioni ACL sui seguenti oggetti"
 
 #: 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 "Cio' include tutte le assegnazioni ACL fatte su questo nodo(i). Se si desidera l'elenco delle assegnazioni, si prega di annullare e aprire l'oggetto."
+msgstr ""
+"Cio' include tutte le assegnazioni ACL fatte su questo nodo(i). Se si "
+"desidera l'elenco delle assegnazioni, si prega di annullare e aprire "
+"l'oggetto."
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 7450982e529c73ed84f0a90bc4b0dcce7def624e..635063257a01af3e394384cf60586899c94811ad 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Brīdinājums"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Lietotāji"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Izveidot"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Lietotāji"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Kļūda"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Iekšējā kļūda"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Atļauja"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Kļūda"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Darbības"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Atļauja"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1972,12 @@ msgstr "Vārds "
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Apraksts"
@@ -2119,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2031,8 @@ msgstr "Labot"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2041,154 @@ msgstr "Labot"
 msgid "Remove"
 msgstr "Noņemt"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2400,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2539,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2567,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2588,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Uzvārds"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Vārds"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Atrašanās vieta"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Valsts"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adrese"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Tālrunis"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobilais"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Peidžeris"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fakss"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Mājas pasta adrese"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Mājas tālruņa numurs"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Nosaukums"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organizācija"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Nodaļa"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Pasta indekss"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2984,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3419,543 +3095,476 @@ msgid ""
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3663,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3873,7 @@ msgid "Information"
 msgstr "Informācija"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3897,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
@@ -4964,7 +4557,9 @@ msgstr ""
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/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. "
+msgstr ""
+"Ja esat pārliecināts, spiediet \"izdzēst\", lai turpinātu, vai \"Atcelt\", "
+"lai pārtrauktu. "
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index a8a4f2088968394da5df2e2195c4d73943fb3097..11ad676068b93d911b3eba289c9e693ad715767d 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Feil"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Opprett"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Feil"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Feil"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1972,12 @@ msgstr "Navn"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Beskrivelse"
@@ -2119,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2031,8 @@ msgstr "Endre"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2041,154 @@ msgstr "Endre"
 msgid "Remove"
 msgstr "Fjern"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2400,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2539,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2567,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2588,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Bruker"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2984,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3089,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Vert"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3663,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3873,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3897,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 39df2925ee63eccbdcb56ba1dd23d3a3d1c7c340..92c6ec1e81b09347daa223eb4fa41aef4805e719 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -1,943 +1,882 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Gewenste taal"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Taal setup"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Deze stap laat je toe om je gewenste taal te kiezen."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Naam van de locatie"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "Connectie URI"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS connectie"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Basis"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Authentificatie"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Beheerders DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Beheerders wachtwoord"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Huidige status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "LDAP setup"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "LDAP connectie setup"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Deze dialoog zorgt voor de basis configuratie van de LDAP connectiviteit "
+"voor FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonieme bind naar server '%s' is mislukt! "
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Bind als gebruiker '%s' is mislukt!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Opnieuw proberen"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Anonieme bind naar server '%s' is succesvol."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Ververs"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Specifieer aub een gebruikersnaam en paswoord!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Bind als gebruiker '%s' naar server '%s' is succesvol!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Setup error"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Voltooid"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Volgende"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Welkom"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Opslaan"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Voltooid - schrijf configuratie bestand"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Schrijf configuratie bestand"
+
+#: 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 "
+"bestandsrechten!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "De configuratie is momenteel niet leesbaar of bestaat niet."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"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, "
+"terwijl andere gebruikers dit niet kunnen."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "PHP module en extensie verificaties"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Installatie verificatie"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Standaard verificatie voor PHP compatibiliteit en extensies"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "PHP versie word geverifiëerd"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP moet versie %s zijn of meer"
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Upgrade aub naar de gesupporteerde versie."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory heeft deze module nodige om te kunnen communiceren met de LDAP server."
+msgstr ""
+"FusionDirectory heeft deze module nodige om te kunnen communiceren met de "
+"LDAP server."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory heeft deze module nodig voor een internationale inferface."
+msgstr ""
+"FusionDirectory heeft deze module nodig voor een internationale inferface."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory heeft deze module nodig om te kunnen communiceren met verschillende types van servers en protocollen."
+msgstr ""
+"FusionDirectory heeft deze module nodig om te kunnen communiceren met "
+"verschillende types van servers en protocollen."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory heeft deze module nodig voor samba integratie."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory heeft of de 'mhash' of de 'sha1' module nodig om gebruik te maken van SSHA encryptie."
+msgstr ""
+"FusionDirectory heeft of de 'mhash' of de 'sha1' module nodig om gebruik te "
+"maken van SSHA encryptie."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory heeft deze module nodig om met de IMAP server te kunnen communiceren."
+msgstr ""
+"FusionDirectory heeft deze module nodig om met de IMAP server te kunnen "
+"communiceren."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr "FusionDirectory heeft deze module nodig om unicode strings te kunnen behandelen."
+msgstr ""
+"FusionDirectory heeft deze module nodig om unicode strings te kunnen "
+"behandelen."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
-msgstr "FusionDirectory heeft deze extensie nodig om afbeeldingen te kunnen bewerken."
+msgstr ""
+"FusionDirectory heeft deze extensie nodig om afbeeldingen te kunnen "
+"bewerken."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "compressie module"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr "FusionDirectory heeft deze extensie nodig om snapshots te kunnen behandelen."
+msgstr ""
+"FusionDirectory heeft deze extensie nodig om snapshots te kunnen behandelen."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals is een PHP mechanisme om alle globale variabelen te registreren en toegankelijk te maken vanuit scripts zonder de scope te moeten aanpassen. Dit kan een veiligheidsrisico vormen. "
+msgstr ""
+"register_globals is een PHP mechanisme om alle globale variabelen te "
+"registreren en toegankelijk te maken vanuit scripts zonder de scope te "
+"moeten aanpassen. Dit kan een veiligheidsrisico vormen. "
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Zoek voor 'register_globals' in je php.ini en schakel het 'uit'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP gebruikt deze waarde voor de vuilbak verzamelaar en om oude sessies te verwijderen."
+msgstr ""
+"PHP gebruikt deze waarde voor de vuilbak verzamelaar en om oude sessies te "
+"verwijderen."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Deze waarde naar 1 dag plaatsen kan het verliezen van de sessies en cookiesdoor timeout voorkomen."
+msgstr ""
+"Deze waarde naar 1 dag plaatsen kan het verliezen van de sessies en "
+"cookiesdoor timeout voorkomen."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Zoek voor 'session.gc_maxlifetime' in je php.ini en plaats het naar 86400 of hoger."
+msgstr ""
+"Zoek voor 'session.gc_maxlifetime' in je php.ini en plaats het naar 86400 of"
+" hoger."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Uit"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Om FusionDirectory zonder problemen te kunnen gebruiken, de moet je de session.auto_start optie in je php.ini naar 'Off' wijzigen."
+msgstr ""
+"Om FusionDirectory zonder problemen te kunnen gebruiken, de moet je de "
+"session.auto_start optie in je php.ini naar 'Off' wijzigen."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Zoek naar 'session.auto_start' in je php.ini en zet de waarde naar 'Off'."
+msgstr ""
+"Zoek naar 'session.auto_start' in je php.ini en zet de waarde naar 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory heeft tenminste 128MB geheugen nodig. Het lager dan deze limiet plaatsen kan errors veroorzaken die niet hergeproduceerd kunnen worden! Vergroot deze waarde voor grotere installaties."
+msgstr ""
+"FusionDirectory heeft tenminste 128MB geheugen nodig. Het lager dan deze "
+"limiet plaatsen kan errors veroorzaken die niet hergeproduceerd kunnen "
+"worden! Vergroot deze waarde voor grotere installaties."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Zoek voor 'memory_limit' in je php.ini en plaats het naar '128M' of hoger."
+msgstr ""
+"Zoek voor 'memory_limit' in je php.ini en plaats het naar '128M' of hoger."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Deze optie beinvloed de PHP output handling. Zet deze optie uit, om performantie te verhogen."
+msgstr ""
+"Deze optie beinvloed de PHP output handling. Zet deze optie uit, om "
+"performantie te verhogen."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Zoek naar 'implicit_flush' in je php.ini and zet de waarde 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "De uitvoertijd zou minstens 30 seconden moeten zijn."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Zoek naar 'max_execution_time' in je php.ini en zet het naar '30' of hoger."
+msgstr ""
+"Zoek naar 'max_execution_time' in je php.ini en zet het naar '30' of hoger."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Verhoog de veiligheid van de server door de optie expose_php naar 'off' te plaatsen. PHP zal geen informatie over de server die je draait verzenden als je dit doet."
+msgstr ""
+"Verhoog de veiligheid van de server door de optie expose_php naar 'off' te "
+"plaatsen. PHP zal geen informatie over de server die je draait verzenden als"
+" je dit doet."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Zoek naar 'expose_php' in je php.ini en zet het naar 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Verhoog je server performantie door de optie magic_quotes_gpc naar 'off' te plaatsen."
+msgstr ""
+"Verhoog je server performantie door de optie magic_quotes_gpc naar 'off' te "
+"plaatsen."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Welkom"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Welkom bij de FusionDirectory setup wizard"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Het welkomstbericht"
+msgstr ""
+"Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar "
+"'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migratie"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "LDAP inspectie"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analyseer je huidige LDAP voor FusionDirectory compatibiliteit"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspectie van de object classes in root object"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Rechten aan het nakijken voor de LDAP databank"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Verificatie voor onzichtbare gebruikers"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Verificatie voor super administrator"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Verificatie voor gebruikers buiten de people tree"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Verificatie voor groepen buiten de groups tree"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Verificatie voor onzichtbare departementen"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Verificatie voor duplicate UID nummers"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "LDAP query faalde"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Mislukt"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Ontbrekende FusionDirectory object class '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Kijk je installatie na aub."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "Kan het structurele object type van je root object niet gebruiken. Probeer de object class '%s' manueel toe te voegen."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"Kan het structurele object type van je root object niet gebruiken. Probeer "
+"de object class '%s' manueel toe te voegen."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "%s gebruiker(s) gevonden die niet zichtbaar zijn in FusionDirectory of die incompleet zijn."
+msgstr ""
+"%s gebruiker(s) gevonden die niet zichtbaar zijn in FusionDirectory of die "
+"incompleet zijn."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Migratie error"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Aanmaken"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Gebruikers"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Groepen"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Rolen"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Er is geen FusionDirectory administrator account in je LDAP."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Aanmaken"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Fout"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
-msgstr ""
+msgstr "Kan de ACL rol \"%s\" niet toevoegen:"
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Verplaats gebruikers in deze geconfigureerde user tree"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "naar"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "De volgende referenties zullen upgedate worden"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Vond %s groepen buiten de geconfigureerde tree '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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."
+msgstr ""
+"Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Naam van de locatie"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "Connectie URI"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS connectie"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Authentificatie"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Beheerders DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Beheerders wachtwoord"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Huidige status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "LDAP setup"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "LDAP connectie setup"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Deze dialoog zorgt voor de basis configuratie van de LDAP connectiviteit voor FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonieme bind naar server '%s' is mislukt! "
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Bind als gebruiker '%s' is mislukt!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Opnieuw proberen"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Anonieme bind naar server '%s' is succesvol."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Ververs"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Specifieer aub een gebruikersnaam en paswoord!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Bind als gebruiker '%s' naar server '%s' is succesvol!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Opslaan"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Voltooid - schrijf configuratie bestand"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Schrijf configuratie bestand"
-
-#: setup/class_setupStep_Finish.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 bestandsrechten!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "De configuratie is momenteel niet leesbaar of bestaat niet."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"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, terwijl andere gebruikers dit niet kunnen."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Setup error"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Voltooid"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Welkom bij de FusionDirectory setup wizard"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Volgende"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Het welkomstbericht"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Logging faalde: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "Gespecifieerd objectType is leeg of ongeldig!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "niet geconfigureerd"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Filter fout"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Deze filter is niet compleet!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Rechten"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Permissiefout"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "Geen tab declaratie voor '%s' gevonden in je configuratie bestand. Kan plugin instantie niet aanmaken!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Verwerk"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Omhoog"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Omlaag"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Selecteer alles"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Fout"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "aangemaakt door"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acties"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Kopieer"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Knip"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Restaureer snapshots"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Export lijst"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Restaureer snapshot"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Maak snapshot"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Maak een nieuw snapshot van dit object"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Fatale fout."
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "in"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "op lijn"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "XML error"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +888,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Configuratie fout"
@@ -978,310 +917,302 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
+msgstr ""
+"Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Rechten"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annuleer alles"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Kan niet plakken"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Inlognaam"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Sjabloon"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Sjabloon naam"
 
-#: include/functions.inc:104
+#: 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"
+msgstr ""
+"Fatale error: geen class locaties gedefinieerd - draai aub '%s' om dit op te"
+" lossen"
 
-#: include/functions.inc:123
+#: 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"
+msgstr ""
+"Fatale error: kan class '%s' niet instantiëren - probeer '%s' te draaien om "
+"dit op te lossen"
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Fatale fout."
+
+#: include/functions.inc:475
 #, 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'."
+msgstr ""
+"FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Authentificatie error"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Error tijdens het toevoegen van de lock. Contacteer de programmeurs!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, 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 systeembeheerder te contacteren!"
+msgstr ""
+"Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je "
+"systeembeheerder te contacteren!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server returned: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 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."
+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:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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."
+msgstr ""
+"Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
+"limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Regels per pagina"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Filter toepassen"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
-msgstr ""
+msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
-msgstr ""
+msgstr "%sKiB"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
-msgstr ""
+msgstr "%sMiB"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
-msgstr ""
+msgstr "%sGiB"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
-msgstr ""
+msgstr "%sTiB"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
-msgstr ""
+msgstr "%sPiB"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
-msgstr ""
+msgstr "%sEiB"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
-msgstr ""
+msgstr "%sZiB"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
-msgstr ""
+msgstr "%sYiB"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Bestand '%s' kon niet verwijderd worden. Probeer fusiondirectory-setup --check-directories om de rechten correct te plaatsen."
+msgstr ""
+"Bestand '%s' kon niet verwijderd worden. Probeer fusiondirectory-setup "
+"--check-directories om de rechten correct te plaatsen."
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Kan niet wegschrijven naar revisie bestand!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Kan revisie bestand niet lezen!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP waarschuwing"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr "Kan geen schema informatie krijgen van de server. Geen schema verificatie mogelijk!"
+msgstr ""
+"Kan geen schema informatie krijgen van de server. Geen schema verificatie "
+"mogelijk!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Class(es) beschikbaar"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Kan geen vrij ID  toekennen:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "onbekende idAllocation methode!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >=%sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool is niet uniek!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "Geen ID beschikbaar!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "maximum pogingen overschreden!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Kan geen vrij ID toekennen!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Alle objecten in deze categorie"
 
-#: include/class_msg_dialog.inc:169
+#: 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."
 
@@ -1290,46 +1221,47 @@ msgstr "Los aub de bovenstaande error op en herlaad de pagina."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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 de LDAP. Gelie je systeembeheerder te contacteren."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "De snapshot functionaliteit is aan, maar de vereiste variabele '%s' is niet ingesteld."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "De snapshot funcionaliteit is geactiveerd, maar de vereiste compressie module ontbreekt. Installeer aub '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Alle categoriën"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mijn account"
 
@@ -1352,7 +1284,7 @@ msgstr "Selecteer om objecten te tonen die '%s' actief hebben"
 msgid "Select to search within subtrees"
 msgstr "Selecteer om binnen subonderdelen te zoeken"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Zoek in subtrees"
 
@@ -1578,7 +1510,7 @@ msgstr "Het vereiste veld '%s' is leeg!"
 
 #: include/class_msgPool.inc:435
 msgid "Example:"
-msgstr ""
+msgstr "Voorbeeld:"
 
 #: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
@@ -1601,8 +1533,7 @@ msgid "Missing %s PHP extension!"
 msgstr "%s PHP extensie ontbreekt!"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1541,7 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Toepassen"
@@ -1666,258 +1597,274 @@ msgstr "De account heeft geen geldige %s extensies!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Deze account heeft %s opties actief. Je kan deze desactiveren door op ze te klikken hieronder."
+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
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "Deze account heeft %s opties actief. Om ze te desactiveren, zal je de %s opties eerst moeten verwijderen!"
+msgstr ""
+"Deze account heeft %s opties actief. Om ze te desactiveren, zal je de %s "
+"opties eerst moeten verwijderen!"
 
 #: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Deze account heeft %s opties op non-actief. Om ze te activeren kan je hieronder op ze klikken."
+msgstr ""
+"Deze account heeft %s opties op non-actief. Om ze te activeren kan je "
+"hieronder op ze klikken."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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!"
+msgstr ""
+"Deze account heeft %s opties op non-actief. Om ze te activeren moet je de %s"
+" opties eerst toevoegen!"
 
-#: include/class_msgPool.inc:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr "Voeg %s opties toe"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Verwijder %s opties"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Januari"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Februari"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Maart"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mei"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Augustus"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "December"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Zondag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Maandag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Databank operatie faalde!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lees operatie"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "voeg operatie toe"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "wijzig operatie"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "verwijder operatie"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "zoek operatie"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "authentificatie"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s faalde!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "LDAP operaite faalde!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Object"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Upload faalde!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Upload faalde: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Communicatie met de infrastructuur dienst faalde!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Communicatie met de infrastructuur dienst faalde: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "De '%s' is nog steeds in gebruik."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Bestand '%s' bestaat niet!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen om te lezen!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen om te schrijven!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, 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!"
+msgstr ""
+"De waarde voor '%s' is momenteel niet geconfigureerd of niet geldig, "
+"verifieer aub je configuratie bestand!"
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan folder '%s' niet maken!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan folder '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificatie voor %s support"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installeer en activeer de %s PHP module."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installeer en activeer de %s Pear module."
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Kan class '%s' niet initializeren! Misschien ontbreekt er een plugin in je FusionDirectory setup?"
+msgstr ""
+"Kan class '%s' niet initializeren! Misschien ontbreekt er een plugin in je "
+"FusionDirectory setup?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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!"
+msgstr ""
+"De opgegeven base is niet geldig en is veranderd naar de vorige waarde!"
 
 #: include/class_SnapshotDialogs.inc:30
 msgid "Creating an object snapshot"
@@ -1937,7 +1884,7 @@ msgstr ""
 
 #: include/class_SnapshotDialogs.inc:41
 msgid "Reason"
-msgstr ""
+msgstr "Reden"
 
 #: include/class_SnapshotDialogs.inc:41
 msgid "Reason for creating this snapshot"
@@ -1956,7 +1903,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2006,7 +1952,8 @@ msgstr "Argumenten"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
+msgstr ""
+"Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
@@ -2020,81 +1967,87 @@ msgstr "Stuur probleemrapport"
 msgid "Toggle information"
 msgstr "Informatie weergeven/verbergen"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Performantie waarschuwing"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +2055,12 @@ msgstr "Naam"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Omschrijving"
@@ -2119,11 +2071,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2114,8 @@ msgstr "Bewerken"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2124,154 @@ msgstr "Bewerken"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "Geen plugin definities gevonden om '%s' te initializeren, verifieer aub je configuratie bestand."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
-msgstr ""
+msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
-msgstr ""
+msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
-msgstr ""
+msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
-msgstr ""
+msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "seconden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "uren"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "dagen"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Filter fout"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Deze filter is niet compleet!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Permissiefout"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
-msgstr ""
+msgstr "Geen label"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2311,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -2343,7 +2321,7 @@ msgstr "Uploaden"
 msgid "Download"
 msgstr "Downloaden"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2372,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "Rechten"
@@ -2445,14 +2406,20 @@ msgstr "Onbekende inzending '%s'!"
 msgid "All users"
 msgstr "Alle gebruikers"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Filter toepassen"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
+msgstr ""
+"Directory '%s' die opgegeven is als compileer directory is niet "
+"toegankelijk!"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2487,7 +2454,7 @@ msgstr "Je FusionDirectory sessie is vervallen!"
 
 #: html/index.php:211
 msgid "Your IP has changed!"
-msgstr ""
+msgstr "Je IP-adres is gewijzigd"
 
 #: html/index.php:214
 #, php-format
@@ -2518,40 +2485,37 @@ msgstr "Geef a.u.b. uw wachtwoord op!"
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en herlaad deze pagina voordat u inlogt!"
+msgstr ""
+"Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en "
+"herlaad deze pagina voordat u inlogt!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2565,12 +2529,12 @@ msgstr "E-mail adres"
 #: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
-msgstr ""
+msgstr "Kan geen account vinden met login \"%s\""
 
 #: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
-msgstr ""
+msgstr "Er zijn meerdere accounts gevonden met login \"%s\""
 
 #: html/class_passwordRecovery.inc:507
 #, php-format
@@ -2595,9 +2559,10 @@ msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 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"
+msgstr ""
+"Er was een probleem met de mail server, de bevestiging werd niet verstuurd"
 
 #: html/main.php:115
 msgid "PHP configuration"
@@ -2607,7 +2572,9 @@ msgstr "PHP configuratie"
 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."
+msgstr ""
+"Fatale error : Registreer globals in aan. FusionDirectory zal login weigeren"
+" als dit niet opgelost wordt door een admin."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2638,7 +2605,9 @@ msgstr "Plugin"
 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 geen bestand)!"
+msgstr ""
+"Fatale error: Kan plugin definities niet vinden voor plugin '%s' ('%s' is "
+"geen bestand)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
@@ -2649,7 +2618,9 @@ msgstr "Configuratie Error"
 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!"
+msgstr ""
+"Fatale error: niet alle POST variabelen zijn verplaatst naar PHP - Informeer"
+" aub je administrator!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2662,225 +2633,8 @@ msgstr "Welkom %s!"
 msgid "References"
 msgstr "Referenties"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Wijzig gebruikers POSIX opties"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Persoonlijke map"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Primaire groep"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Groep lidmaatschap"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Account"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Systeem vertrouwen"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Vertrouwensmodus"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "gedeactiveerd"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "volledige toegang"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "sta toegang op deze computers toe"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automatisch"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "verlopen"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "gratie tijd actief"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "actief"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "paswoord is vervallen"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "paswoord niet wijzigbaar"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Timeout tijdens het wachten voor een lock. lock is genegeerd!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2661,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2682,295 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Gebruiker"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
-msgstr ""
+msgstr "Gebruikersaccount"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
-msgstr ""
+msgstr "Achternaam van deze gebruiker"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Voornaam"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
-msgstr ""
+msgstr "Voornaam van deze gebruiker"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
-msgstr ""
+msgstr "Afbeelding"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Kamernummer"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefoon"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
-msgstr ""
+msgstr "Persoonlijke homepagina"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
-msgstr ""
+msgstr "account informatie"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Getoonde naam"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Postadres thuis"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Prive nummer"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organisatie"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Afdeling"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Departement nummer"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Werknemer nummer"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Beheerder"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Postcode"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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 wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "Het nieuw opgegeven wachtwoord is te kort."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
 
@@ -3209,16 +2980,16 @@ msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:39
 msgid "Users statistics"
-msgstr ""
+msgstr "Statistieken van gebruikers"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:44
 msgid "Groups statistics"
-msgstr ""
+msgstr "Statistieken van groepen"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:49
 #: plugins/addons/dashboard/users_accounts.tpl.c:8
 msgid "Expired accounts"
-msgstr ""
+msgstr "Vervallen accounts"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:27
 #: plugins/addons/dashboard/class_dashBoard.inc:28
@@ -3228,28 +2999,28 @@ msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoard.inc:29
 msgid "Statistics and various information"
-msgstr ""
+msgstr "Statistieken en diverse informatie"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:38
 msgid "Reporting"
-msgstr ""
+msgstr "Rapportering"
 
 #: plugins/addons/dashboard/class_dashBoard.inc:49
 #: plugins/addons/dashboard/main_stats.tpl.c:2
 msgid "Statistics"
-msgstr ""
+msgstr "Statistieken"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:26
 msgid "Passwords"
-msgstr ""
+msgstr "Wachtwoorden"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:27
 msgid "Statistics about passwords"
-msgstr ""
+msgstr "Statistieken van het wachtwoord"
 
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:38
 msgid "Passwords statistics"
-msgstr ""
+msgstr "Wachtwoord statistieken"
 
 #: plugins/config/class_recoveryConfig.inc:28
 msgid "Password recovery"
@@ -3308,7 +3079,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Login attribuut"
 
@@ -3399,7 +3170,7 @@ msgstr "Configuratie"
 #: plugins/config/class_configInLdap.inc:57
 #: plugins/config/class_configInLdap.inc:62
 msgid "FusionDirectory configuration"
-msgstr ""
+msgstr "FusionDirectory configuratie"
 
 #: plugins/config/class_configInLdap.inc:58
 msgid "Configuration screen of FusionDirectory"
@@ -3436,539 +3207,472 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activeer snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Snaphosts basis"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Paswoord opties"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Paswoord minimum lengte"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Gebruik account expiration"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Toon overzicht in lijsten"
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Login en sessie"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forceer gëencrypteerde connecties"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Verwittig mij als de sessie niet gëencrypteerd is"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Sessie levensduur"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activeer snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Snaphosts basis"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Poort"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "People and group opslag"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "People DN attribuut"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
-msgstr ""
+msgstr "Fouten weergeven"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximum LDAP query tijd"
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Log LDAP statistieken"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug level"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Terminal Service diverse"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Toon overzicht in lijsten"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modus"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: 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:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Inhakers"
+#: 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:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Inhakers"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modus"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
+msgstr "Commando"
+
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: plugins/config/class_pluginsConfigInLdap.inc:30
 msgid "Configuration for plugins"
-msgstr ""
+msgstr "Configuratie voor plugins"
 
 #: plugins/config/class_mainPluginsConfig.inc:28
 msgid "Plugins configuration"
-msgstr ""
+msgstr "Plugins configuratie"
 
 #: plugins/config/class_mainPluginsConfig.inc:29
 msgid "FusionDirectory plugins configuration"
@@ -4054,9 +3758,8 @@ msgstr "afdeling"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4088,7 +3791,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:80
 msgid "Website"
-msgstr ""
+msgstr "Website"
 
 #: plugins/admin/departments/class_department.inc:80
 #, php-format
@@ -4122,7 +3825,7 @@ msgstr ""
 
 #: plugins/admin/departments/class_organization.inc:51
 msgid "organization"
-msgstr ""
+msgstr "Organisatie"
 
 #: plugins/admin/departments/class_domain.inc:30
 #: plugins/admin/departments/class_domain.inc:31
@@ -4132,7 +3835,7 @@ msgstr "Domein"
 
 #: plugins/admin/departments/class_domain.inc:51
 msgid "domain"
-msgstr ""
+msgstr "Domein"
 
 #: plugins/admin/departments/class_departmentManagement.inc:35
 msgid "Manage departments"
@@ -4184,22 +3887,22 @@ msgstr "Beheer gebruikers"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Account locking"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Deblokkeer account"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Blokkeer account"
 
@@ -4245,7 +3948,7 @@ msgstr "Verwijder gebruiker"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,10 +3968,9 @@ msgid "Information"
 msgstr "Informatie"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
-msgstr ""
+msgstr "Naam van deze groep"
 
 #: plugins/admin/groups/class_roleGeneric.inc:91
 msgid "Description of the role"
@@ -4290,164 +3992,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Voeg gebruikers toe voor de rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Wijzig posix eigenschappen"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Toon primaire groepen"
+msgstr "Toon gebruikers groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Toon primaire groepen"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Toon mailgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Toon Samba groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
-msgstr ""
+msgstr "Toon server groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
-msgstr ""
+msgstr "Toon workstation groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
-msgstr ""
+msgstr "Toon Windows groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
-msgstr ""
+msgstr "Toon printer groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
-msgstr ""
+msgstr "Toon telefoon groepen"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
-msgstr ""
+msgstr "Onbekend type: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
-msgstr ""
+msgstr "Onbestaand dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objectgroep"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
-msgstr ""
+msgstr "Object groep informatie"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Lidmaatschap objecten"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Systeem vertrouwen"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lijst met groepen"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Vertrouwensmodus"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "gedeactiveerd"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "volledige toegang"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forceer GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "sta toegang op deze computers toe"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Groepsleden"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lijst met groepen"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4461,7 +4155,7 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:49
 msgid "Dn"
-msgstr ""
+msgstr "Dn"
 
 #: plugins/admin/acl/class_aclManagement.inc:49
 msgid "DN you wish to add assignments for"
@@ -4473,7 +4167,7 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:139
 msgid "ACL assignments"
-msgstr ""
+msgstr "ACL taken"
 
 #: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments management"
@@ -4496,10 +4190,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modus"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4518,7 +4208,7 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:52
 msgid "For all users"
-msgstr ""
+msgstr "Voor alle gebruikers"
 
 #: plugins/admin/acl/class_aclAssignment.inc:52
 msgid "Apply this ACL for all LDAP users"
@@ -4540,7 +4230,7 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:259
 msgid "ACL assignment"
-msgstr ""
+msgstr "ACL taak"
 
 #: plugins/admin/acl/class_aclAssignment.inc:274
 msgid "Access control roles assignment"
@@ -4548,7 +4238,7 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclAssignment.inc:293
 msgid "Assignments"
-msgstr ""
+msgstr "Taken"
 
 #: plugins/admin/acl/class_aclAssignment.inc:297
 msgid "ACL role assignments for this base"
@@ -4655,7 +4345,7 @@ msgstr ""
 
 #: plugins/admin/aclrole/class_aclRole.inc:109
 msgid "ACLs"
-msgstr ""
+msgstr "ACLs"
 
 #: plugins/admin/aclrole/class_aclRole.inc:113
 msgid "ACLs which are part of this group"
@@ -4677,7 +4367,9 @@ msgstr "Maak een nieuwe FusionDirectory administrator account"
 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."
+msgstr ""
+"Deze dialoog zal automatisch een nieuwe super administrator toevoegen in je "
+"LDAP tree."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4692,7 +4384,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "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."
+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."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4708,7 +4403,8 @@ msgstr "Probeer problemen te vinden met 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"
+msgstr ""
+"Laat je kiezen van een set basis of geavanceerde configuratie switches"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -4728,7 +4424,7 @@ msgstr "Migreer elke mogelijke LDAP setup - maak backup dumps!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
-msgstr ""
+msgstr "Om verder te gaan:"
 
 #: setup/setup_welcome.tpl.c:32
 msgid ""
@@ -4745,13 +4441,11 @@ msgstr "Klik op de 'Next' knop wanneer je klaar bent."
 msgid "Add required object classes to the LDAP base"
 msgstr "Voeg benodigde object classes naar de LDAP base"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Huidige"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Na de migratie"
 
@@ -4759,51 +4453,58 @@ msgstr "Na de migratie"
 msgid "Close"
 msgstr "Sluiten"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Verifieer nogmaals"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Als je wilt weten wat er zal gebeuren wanneer je de geselecteerde inzendingen migreerd, gebruik de 'Toon veranderingen' knop om de LDIF te bekijken."
+msgstr ""
+"Als je wilt weten wat er zal gebeuren wanneer je de geselecteerde "
+"inzendingen migreerd, gebruik de 'Toon veranderingen' knop om de LDIF te "
+"bekijken."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Toon wijzigingen"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Verifieer nogmaals"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Maak je configuratie bestand"
@@ -4842,7 +4543,10 @@ msgstr ""
 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."
+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
@@ -4879,7 +4583,9 @@ msgstr "Je paswoord is succesvol gewijzigd."
 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' knop."
+msgstr ""
+"Vul je huidige e-mail adres in in onderstaand veld en klik op de 'Verander' "
+"knop."
 
 #: ihtml/themes/breezy/recovery.tpl.c:62
 msgid ""
@@ -4895,7 +4601,9 @@ msgstr "E-mail"
 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"
+msgstr ""
+"Paswoord herstel is niet geactiveerd. Als u uw wachtwoord verloren hebt, "
+"gelieve dan uw beheerder te contacteren"
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4905,7 +4613,9 @@ msgstr "Login scherm"
 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."
+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
@@ -4930,7 +4640,11 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " 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 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."
+msgstr ""
+"De grootte limiet 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."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4944,7 +4658,9 @@ msgstr "Negeer deze fout en toon alle gegevens die de LDAP server teruggeeft"
 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"
+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"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4959,12 +4675,16 @@ msgstr ""
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren'"
+" om te annuleren."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5035,17 +4755,25 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Sommige waarden moeten uniek zijn in de volledige directory terwijl sommige combinaties geen zin hebben. FusionDirectory toont de relevante attributen. Behoud aub de waarden hieronder om de policies te vervullen."
+msgstr ""
+"Sommige waarden moeten uniek zijn in de volledige directory terwijl sommige "
+"combinaties geen zin hebben. FusionDirectory toont de relevante attributen. "
+"Behoud aub de waarden hieronder om de policies te vervullen."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Onthoud dat sommige eigenschappen zoals snaphots zijn en niet kunnen gekopieerd worden!"
+msgstr ""
+"Onthoud dat sommige eigenschappen zoals snaphots zijn en niet kunnen "
+"gekopieerd worden!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Of als je een kopie of knip doet van een inzending in FusionDirectory en de bron van het object verwijderd kan je errors krijgen tijdens het plakken van het object!"
+msgstr ""
+"Of als je een kopie of knip doet van een inzending in FusionDirectory en de "
+"bron van het object verwijderd kan je errors krijgen tijdens het plakken van"
+" het object!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5053,7 +4781,7 @@ msgstr "Bewerking afgerond"
 
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
-msgstr ""
+msgstr "Een nieuw object aanmaken aan de hand  van een template"
 
 #: ihtml/themes/breezy/acl.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5153,7 +4881,9 @@ msgstr "Je paswoord hash methode zal niet worden aangepast!"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle programma's die dit wachtwoord gebruiken ook aanpast!"
+msgstr ""
+"U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle "
+"programma's die dit wachtwoord gebruiken ook aanpast!"
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
@@ -5202,7 +4932,7 @@ msgstr[1] ""
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
-msgstr ""
+msgstr "Geen van hen zijn geblokkeerd"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:2
 msgid "There is one expired account"
@@ -5227,7 +4957,7 @@ msgstr "uid"
 #: plugins/addons/dashboard/users_accounts.tpl.c:17
 #: plugins/addons/dashboard/users_accounts.tpl.c:50
 msgid "cn"
-msgstr ""
+msgstr "cn"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:20
 #: plugins/addons/dashboard/users_accounts.tpl.c:32
@@ -5244,12 +4974,12 @@ msgstr ""
 #: plugins/addons/dashboard/users_accounts.tpl.c:26
 #: plugins/addons/dashboard/users_accounts.tpl.c:59
 msgid "manager"
-msgstr ""
+msgstr "Manager"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:29
 #: plugins/addons/dashboard/users_accounts.tpl.c:62
 msgid "mail"
-msgstr ""
+msgstr "E-mail"
 
 #: plugins/addons/dashboard/users_accounts.tpl.c:35
 msgid "There is one account expiring in the next %1 days"
@@ -5299,4 +5029,4 @@ msgstr ""
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
+msgstr "Druk op 'Verwijderen' om door te gaan of 'Annuleren' om af te breken"
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 3c0a3a2c0ef46f1a07919ad52ab7fa86b7868f44..4bfe3d7c1f2a7c265925dc37f791b6978b40536d 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "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"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Ustawienia językowe"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Tek krok umożliwia wybranie preferowanego języka."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nazwa lokalizacji"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Kontener"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN Administratora"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Hasło Administratora"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Obecny status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Ustawienia LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Ponawia"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Błąd ustawień"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Następne"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Witaj"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Zakończ"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Zapisz plik konfiguracyjny"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Sprawdzenie instalacji"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Sprawdzam wersjÄ™ PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Proszę zaktualizować do wspieranej wersji."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "moduł kompresji"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Wyłączone"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Witaj"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Wiadomość powitalna"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "BÅ‚Ä…d migracji"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Użytkownicy"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Grupy"
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Utwórz"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Użytkownicy"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr "Grupy"
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Przenieś użytkowników do skonfigurowanego drzewa"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nazwa lokalizacji"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Kontener"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN Administratora"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Hasło Administratora"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Obecny status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Ustawienia LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Ponawia"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Zakończ"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Zapisz plik konfiguracyjny"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Błąd ustawień"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Następne"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Wiadomość powitalna"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "nieskonfigurowane"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Uprawnienie"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Wyślij"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Góra"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "W dół"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Wybierz wszystko"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "utworzone przez"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Akcje"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Wytnij"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "BÅ‚Ä…d krytyczny"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "w"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "BÅ‚Ä…d konfiguracji"
@@ -980,308 +867,286 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Uprawnienie"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Anuluj wszystko"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Login"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Szablon"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nazwa Szablonu"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "BÅ‚Ä…d krytyczny"
+
+#: include/functions.inc:475
 #, 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:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "BÅ‚Ä…d autentykacji"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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"
+msgstr ""
+"Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest"
+" przekroczony"
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr "Wpisów na stronie"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Zastosuj filtr"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Wszystkie obiekty w tej kategorii"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1155,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Moje konto "
 
@@ -1352,7 +1217,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr "Zaznacz aby wyszukiwać wewnątrz poddrzew"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1466,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1474,7 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Zastosuj"
@@ -1682,239 +1546,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Styczeń"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Luty"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzec"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Maj"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Lipiec"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Sierpień"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Wrzesień"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Październik"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Listopad"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Grudzień"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "PiÄ…tek"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sobota"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Obiekt"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Błąd komunikacji z usługą infrastruktury!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Błąd komunikacji z usługą infrastruktury: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Plik '%s' nie istnieje!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1823,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1886,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr "Przełącz informacje"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Ostrzeżenie wydajności"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1974,12 @@ msgstr "ImiÄ™"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Opis"
@@ -2119,11 +1990,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2033,8 @@ msgstr "Edytuj"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2043,154 @@ msgstr "Edytuj"
 msgid "Remove"
 msgstr "Usuń"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Proces usuwania został anulowany przez dodatek '%s': %s"
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "godzin"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "dni"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2230,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Wgraj"
 
@@ -2343,7 +2240,7 @@ msgstr "Wgraj"
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2291,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,11 +2325,15 @@ msgstr "Nieznany wpis  '%s'!"
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Zastosuj filtr"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
@@ -2518,40 +2402,37 @@ msgstr "Proszę podać prawidłowe hasło!"
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Twoja przeglądarka ma wyłączone cookies. Proszę włączyć cookies i przeładować stronę przed logowaniem!"
+msgstr ""
+"Twoja przeglądarka ma wyłączone cookies. Proszę włączyć cookies i "
+"przeładować stronę przed logowaniem!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2595,7 +2476,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2543,8 @@ msgstr "Witaj %s!"
 msgid "References"
 msgstr "Zależności"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Katalog domowy"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Grupa podstawowa"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Przynależność do grup"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Użytkownik musi zmienić hasło przy pierwszym logowaniu"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Zaufanie systemowe"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Tryb zaufania"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "wyłączone"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "pełen dostęp"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "zezwól na dostęp do tych hostów"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automatyczne"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "wygasło"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Czas prolongaty aktywny"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "Aktywne"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "hasło wygasło"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "hasło niezmienialne"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2571,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2592,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Użytkownik"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "ImiÄ™"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Stan"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Wyświetl nazwę"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telefon prywatny"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Tytuł"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organizacja"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Kod pocztowy"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "Hasło podane jako nowe jest za krótkie."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2988,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3436,526 +3116,459 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Minimalna długość hasła"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Tryb"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
-msgstr "Zaczepy"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Zaczepy"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Tryb"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3667,8 @@ msgstr "departament"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3796,22 @@ msgstr "Zarządzaj użytkownikami"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Blokowanie konta"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Odblokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Zablokuj konto"
 
@@ -4245,7 +3857,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3877,7 @@ msgid "Information"
 msgstr "Informacja"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +3901,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Pokaż podstawowe grupy"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Pokaż podstawowe grupy"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Pokaż grupy samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupa obiektu"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupa"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Dodaj członka"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Zaufanie systemowe"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista grup"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Tryb zaufania"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "wyłączone"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "pełen dostęp"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "WymuÅ› GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "zezwól na dostęp do tych hostów"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Członkowie grupy"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista grup"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4099,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Tryb"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4344,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Obecne"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4356,51 @@ msgstr ""
 msgid "Close"
 msgstr "Zamknij"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
@@ -4930,7 +4527,11 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "Limit rozmiaru powoduje szybsze operacje LDAP i zapobiega nadmiernemu obciążeniu serwera LDAP. Najprostrzym sposobem działania na dużych bazach bez opóźnień jest ograniczanie wyszukiwań do mniejszej ilości wyników oraz użycie filtrów dla otrzymania poszukiwanych elementów."
+msgstr ""
+"Limit rozmiaru powoduje szybsze operacje LDAP i zapobiega nadmiernemu "
+"obciążeniu serwera LDAP. Najprostrzym sposobem działania na dużych bazach "
+"bez opóźnień jest ograniczanie wyszukiwań do mniejszej ilości wyników oraz "
+"użycie filtrów dla otrzymania poszukiwanych elementów."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4944,7 +4545,9 @@ msgstr "Ignoruj ten błąd i pokaż wszystkie elementy które zwraca serwer LDAP
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignoruj ten błąd i pokaż wszystkie elementy które zmieszczą się w zdefiniowanych limicie rozmiaru i pozwól mi użyć filtrów"
+msgstr ""
+"ignoruj ten błąd i pokaż wszystkie elementy które zmieszczą się w "
+"zdefiniowanych limicie rozmiaru i pozwól mi użyć filtrów"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4964,7 +4567,9 @@ msgstr ""
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/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ć."
+msgstr ""
+"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
+"anulować."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5039,7 +4644,8 @@ msgstr ""
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Pamiętaj, że niektóre właściwości jak snapshoty nie zostaną skopiowane!"
+msgstr ""
+"Pamiętaj, że niektóre właściwości jak snapshoty nie zostaną skopiowane!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
@@ -5153,7 +4759,9 @@ msgstr ""
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Pomyślnie zmieniono hasło. Proszę pamiętać aby zmienić również ustawienia w programach skonfigurowanych do używania tego hasła."
+msgstr ""
+"Pomyślnie zmieniono hasło. Proszę pamiętać aby zmienić również ustawienia w "
+"programach skonfigurowanych do używania tego hasła."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 3392d0cd9fd7de468b853051c0977db5b23f0b53..d72c66923fb6eeea2111bb465f96a975c321f95c 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estatus"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Recarregar"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Atenção"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finalizar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Erro"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Atenção"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Usuários"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Criar"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Usuários"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr "Grupos"
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Erro"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Estatus"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Recarregar"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finalizar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "desconfigurado"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Submeter"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Para cima"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Para baixo"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Erro"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Ações"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erro de configuração"
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Impossível colar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Login"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Nome modelo"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos os objetos nessa categoria"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,48 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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."
+msgstr ""
+"Não foi possível realizar bind para o LDAP. Por favor, contacte o "
+"administrador do sistema."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Minha conta"
 
@@ -1352,7 +1217,7 @@ msgstr "Selecione para listar objetos que possuem '%s' habilitado"
 msgid "Select to search within subtrees"
 msgstr "Selecione para pesquisar dentro das sub-árvores"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Procurar em subárvores"
 
@@ -1601,8 +1466,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1474,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
@@ -1682,239 +1546,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Janeiro"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Fevereiro"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Março"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Maio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junho"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julho"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Setembro"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Outubro"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Novembro"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Dezembro"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Segunda"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Terça"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Quinta"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Sexta"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1823,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1886,88 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Alerta de performance"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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!"
+msgstr ""
+"A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "enquanto executava em '%s' usando LDAP server '%s'"
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "enquanto executava no LDAP server %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1975,12 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descrição"
@@ -2119,11 +1991,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2034,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2044,154 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Remover"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2231,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2241,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2292,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,11 +2326,15 @@ msgstr "Entrada desconhecida '%s'!"
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,40 +2403,37 @@ 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:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Seu navegador está com suporte a cookies desabilitado. Por favor, habilite-o e recarregue essa página antes de entrar!"
+msgstr ""
+"Seu navegador está com suporte a cookies desabilitado. Por favor, habilite-o"
+" e recarregue essa página antes de entrar!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2595,7 +2477,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2544,8 @@ msgstr "Bem vindo %s!"
 msgid "References"
 msgstr "Referências"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Diretório pessoal"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Grupo primário"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Membros do grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Conta"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "O usuário deve alterar sua senha no primeiro acesso"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Sistema de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Modo de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "desabilitado"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "acesso completo"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "permitir acesso a estas máquinas"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "expirado"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "ativo"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2572,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2593,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Usuário"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informação pessoal"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Último nome"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localização"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Endereço"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Nº da sala"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Fone"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página pessoal"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telefone privativo"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informação organizacional"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organização"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Nº do departamento"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Nº do empregado"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "CEP"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "A senha utilizada como nova é curta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2989,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3427,535 +3108,468 @@ msgstr ""
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3668,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3797,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3858,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3878,7 @@ msgid "Information"
 msgstr "Informação"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +3902,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de confiança"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista dos grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo de confiança"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desabilitado"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "acesso completo"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Forçar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "permitir acesso a estas máquinas"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Membros do grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista dos grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4100,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4345,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4357,51 @@ msgstr ""
 msgid "Close"
 msgstr "Fechar"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
@@ -4964,7 +4562,9 @@ msgstr ""
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Então, se você tem certeza, pressione 'Deletar' para continuar ou 'Cancelar'"
+" para abortar."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5153,7 +4753,9 @@ msgstr ""
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Sua senha foi alterada com sucesso. Lembre-se de alterar todos os programas que a usem."
+msgstr ""
+"Sua senha foi alterada com sucesso. Lembre-se de alterar todos os programas "
+"que a usem."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 97b60592f0ff589aed601b95ff4a71ecce23aab1..02f9a8b877e5deda6fbbd693056ab0a0d3a31ef4 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -1,944 +1,859 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma desejado"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Configuração de idioma"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Esta etapa permite que você selecione seu idioma preferido."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automático"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nome do local"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI da conexão"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "conexão TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN do administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Senha do administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Status atual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuração de LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configuração da conexão de LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este diálogo executa a configuração básica da conectividade LDAP para o "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Ligação anônima para o servidor '%s' falhou!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Ligação como usuário '%s' falhou!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Tente novamente"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Ligação anônima para o servidor '%s' bem sucedida."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Por favor, especifique usuário e senha!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Ligação como usuário '%s' para o servidor '%s' bem sucedida!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Erro de configuração"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Concluído"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Próximo"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bem-vindo"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Fim"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Módulo de PHP e checagem de extensões"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Checagem de instalação"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Verificando a compatibilidade básica com PHP e extensões"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Checando versão do PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "A versão do PHP deverá ser %s ou superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor, atualize para uma versão suportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory necessita deste módulo para conversar com seu servidor LDAP."
+msgstr ""
+"FusionDirectory necessita deste módulo para conversar com seu servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory necessita deste módulo para uma interface internacionalizada."
+msgstr ""
+"FusionDirectory necessita deste módulo para uma interface "
+"internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory necessita deste módulo para se comunicar com diferentes tipo de servidores e protocolos."
+msgstr ""
+"FusionDirectory necessita deste módulo para se comunicar com diferentes tipo"
+" de servidores e protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory requer este módulo para integação com o samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory necessita tanto do módulo 'mhash' quanto do módulo 'sha1' para fazer uso da criptografia SSHA."
+msgstr ""
+"FusionDirectory necessita tanto do módulo 'mhash' quanto do módulo 'sha1' "
+"para fazer uso da criptografia SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "O FusionDirectory necessita deste módulo para conversar com um servidor IMAP"
+msgstr ""
+"O FusionDirectory necessita deste módulo para conversar com um servidor IMAP"
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requer esta extensão para lidar com strings unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requer esta extensão para lidar com imagens."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "módulo de compressão"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requer esta extensão para lidar com snapshots."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals é um mecanismo do PHP utilizado para registrar todas as variáveis globais para serem acessíveis por meio de scripts sem modificar o escopo. Isto pode ser um risco à segurança."
+msgstr ""
+"register_globals é um mecanismo do PHP utilizado para registrar todas as "
+"variáveis globais para serem acessíveis por meio de scripts sem modificar o "
+"escopo. Isto pode ser um risco à segurança."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Procurar por 'register_globals' em seu php.ini e marcado como 'Desativado'."
+msgstr ""
+"Procurar por 'register_globals' em seu php.ini e marcado como 'Desativado'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr "PHP usa este valor para deletar sessões antigas do garbage collector."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Procurar por 'session.gc_maxlifetime' no seu php.ini e configurá-lo para 86400 ou maior."
+msgstr ""
+"Procurar por 'session.gc_maxlifetime' no seu php.ini e configurá-lo para "
+"86400 ou maior."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Desativar"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Pesquisar por 'session.auto_start' no seu php.ini e configurá-lo como 'Desligado'."
+msgstr ""
+"Pesquisar por 'session.auto_start' no seu php.ini e configurá-lo como "
+"'Desligado'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr "Procurar por 'implicit_flush' no seu php.ini e configurá-lo como 'Desligado'."
+msgstr ""
+"Procurar por 'implicit_flush' no seu php.ini e configurá-lo como "
+"'Desligado'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "O tempo de Execução deve ser no mínimo 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Pesquisa por 'max_execution_time' no seu php.ini e defina-o como '30' ou superior."
+msgstr ""
+"Pesquisa por 'max_execution_time' no seu php.ini e defina-o como '30' ou "
+"superior."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr "Pesquisar por 'expose_php' no seu php.ini e defina-o como 'Desligado'."
+msgstr ""
+"Pesquisar por 'expose_php' no seu php.ini e defina-o como 'Desligado'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Aumente o desempenho do seu servidor definindo magic_quotes_gpc para 'desligado'."
+msgstr ""
+"Aumente o desempenho do seu servidor definindo magic_quotes_gpc para "
+"'desligado'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Pesquisar por 'zend.ze1_compatibility_mode' no seu php.ini e defina-o como 'Desligado'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bem-vindo"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bem vindo ao assistente de configuração do FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "A mensagem de \"bem vindo\""
+msgstr ""
+"Pesquisar por 'zend.ze1_compatibility_mode' no seu php.ini e defina-o como "
+"'Desligado'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Inspeção LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
-msgstr "Analisar seu LDAP atual para verificação de compatibilidade com o FusionDirectory"
+msgstr ""
+"Analisar seu LDAP atual para verificação de compatibilidade com o "
+"FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspecionando classes de objeto em objeto root"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Checando permissão para banco de dados LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Checando por usuários invisíveis"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Checando por super administrador"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Checando por usuários fora da árvore de pessoas"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Checando por grupos fora da árvore de grupos"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Checando por departamentos invisíveis"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Checando por números de UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "Consulta em LDAP falhou"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Falhou"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Aviso"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Criar"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuários"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Atribuições"
+
+#: setup/class_setupStepMigrate.inc:804
 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_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Criar"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Erro"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrado %s grupos fora da árvore configurada '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nome do local"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI da conexão"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "conexão TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN do administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Senha do administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Status atual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuração de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configuração da conexão de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Este diálogo executa a configuração básica da conectividade LDAP para o FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Ligação anônima para o servidor '%s' falhou!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Ligação como usuário '%s' falhou!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Tente novamente"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Ligação anônima para o servidor '%s' bem sucedida."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Por favor, especifique usuário e senha!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Ligação como usuário '%s' para o servidor '%s' bem sucedida!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Fim"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Erro de configuração"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Concluído"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bem vindo ao assistente de configuração do FusionDirectory"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Próximo"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "A mensagem de \"bem vindo\""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Registro de dados falhou: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "objectType especificado está vazio ou inválido!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Erro no filtro"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "O filtro está incompleto!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Permissão"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Erro de permissão"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Subir"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Descer"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Erro"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Página inicial"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Ações"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Recortar"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Restaurar snapshots"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Restaurar snapshot"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Criar snapshot"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Criar um novo snapshots deste objeto"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Erro fatal"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "dentro"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "online"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Erro de XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -950,12 +865,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erro de configuração"
@@ -981,308 +896,288 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Permissão"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar tudo"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Login"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Erro fatal"
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Arquivo '%s' não pode ser deletado. Tente fusiondirectory-setup --check-directories para ajustas as permissões."
+msgstr ""
+"Arquivo '%s' não pode ser deletado. Tente fusiondirectory-setup --check-"
+"directories para ajustas as permissões."
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' não está disponível. Utilizando base padrão."
-
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
-#, php-format
-msgid "Class(es) available"
-msgstr ""
-
-#: include/functions.inc:2636
-msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
+#: include/functions.inc:2085
 #, php-format
-msgid "%sPoolMin >= %sPoolMax!"
+msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+#: include/functions.inc:2103
+msgid ""
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
+msgstr ""
+"Não foi possível localizar o arquivo '%s' - execute '%s' para solucionar o "
+"problema"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1291,46 +1186,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "A funcionalidade de snapshots está habilitada, mas a variável necessária '%s' não está definida."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "A funcionalidade de snapshots está habilitada, mas está faltando o módulo de compressão necessário. Por favor, instale '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Minha conta"
 
@@ -1353,7 +1248,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Procurar em sub-árvores"
 
@@ -1602,8 +1497,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1611,7 +1505,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
@@ -1683,239 +1577,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "fevereiro"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "março"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "maio"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "junho"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "julho"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "agosto"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "setembro"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "outubro"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "novembro"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "dezembro"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "domingo"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "segunda-feira"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "terça-feira"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "quarta-feira"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "quinta-feira"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "sexta-feira"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "sábado"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1957,7 +1854,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2021,81 +1917,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 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:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2103,13 +2005,12 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descrição"
@@ -2120,11 +2021,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2161,8 +2064,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2171,130 +2074,154 @@ msgstr "Editar"
 msgid "Remove"
 msgstr "Remover"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "dias"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Erro no filtro"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "O filtro está incompleto!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Erro de permissão"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "SEM RÓTULO"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Erro ao salvar"
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "A entrada %s não é existente"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2334,8 +2261,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Upload"
 
@@ -2344,7 +2271,7 @@ msgstr "Upload"
 msgid "Download"
 msgstr "Download"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2395,27 +2322,10 @@ msgstr "Um float maior que %f"
 msgid "A float smaller than %f"
 msgstr "Um float menor que %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2446,14 +2356,19 @@ msgstr ""
 msgid "All users"
 msgstr "Todos os usuários"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Diretório '%s' especificado como diretório de compilação não está acessível!"
+msgstr ""
+"Diretório '%s' especificado como diretório de compilação não está acessível!"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2471,7 +2386,9 @@ msgstr ""
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "Arquivo de configuração %s/%s do FusionDirectory não está legível. Por favor, execute fusiondirectory-setup --check-config para corrigir isto."
+msgstr ""
+"Arquivo de configuração %s/%s do FusionDirectory não está legível. Por "
+"favor, execute fusiondirectory-setup --check-config para corrigir isto."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2519,40 +2436,37 @@ 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:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Cookies estão desabilitados. Por favor, habilite os cookies em seu navegador e atualize esta página antes de efetuar o login!"
+msgstr ""
+"Cookies estão desabilitados. Por favor, habilite os cookies em seu navegador"
+" e atualize esta página antes de efetuar o login!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2590,13 +2504,15 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 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."
+msgstr ""
+"Entre em contato com o administrador, houve um problema com o servidor de "
+"e-mail."
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2608,7 +2524,10 @@ msgstr "Configuração PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Erro fatal: O registro global do PHP, register_globals, está ativado. Não será possível realizar login enquanto o problema não for solucionado por um administrador."
+msgstr ""
+"Erro fatal: O registro global do PHP, register_globals, está ativado. Não "
+"será possível realizar login enquanto o problema não for solucionado por um "
+"administrador."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2650,7 +2569,9 @@ msgstr "Erro de Configuração"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Erro faral: As variáveis POST não foram todas transferidas pelo PHP - por favor, informe ao administrador!"
+msgstr ""
+"Erro faral: As variáveis POST não foram todas transferidas pelo PHP - por "
+"favor, informe ao administrador!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2663,225 +2584,8 @@ msgstr "Bem-vindo %s!"
 msgid "References"
 msgstr "Referências"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Diretório principal"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "O pacote para o diretório principal deste usuário"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Conta"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Sistema de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Modo de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "desabilitado"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "Acesso total"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "Permitir acesso a esses servidores"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Permitir apenas que este usuário conecte-se à lista de hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "senha expirada"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2908,7 +2612,7 @@ 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:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2929,278 +2633,294 @@ msgstr "Senha novamente"
 msgid "Same password as above, to avoid errors"
 msgstr "Mesma senha como acima, para evitar erros"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Usuário"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localização"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Endereço"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número da sala"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefone"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página inicial"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nome de exibição"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Endereço residencial"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Telefone residencial"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organização"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número do departamento"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número do funcionário"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Tipo de funcionário"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Gerente"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Código postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "A nova senha é muito curta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "A senha contém caracteres Unicode  problemáticos."
 
@@ -3296,7 +3016,9 @@ msgstr "graça para simbolos "
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Apenas uma medida de segurança, você pode botar qualquer coisa lá, até caracteres aleatórios"
+msgstr ""
+"Apenas uma medida de segurança, você pode botar qualquer coisa lá, até "
+"caracteres aleatórios"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3306,10 +3028,12 @@ msgstr "Permitir o uso de endereços alternativos"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Os usuário também serão capazes de entrar no endereço alternativo para recuperar sua senha"
+msgstr ""
+"Os usuário também serão capazes de entrar no endereço alternativo para "
+"recuperar sua senha"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3345,7 +3069,9 @@ msgstr "Corpo(primeiro %s é o login, segundo é o link)"
 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 "Corpo do primeiro e-mail, envie quando o usuário perguntar pela nova senha. Use %s para o login e o link de recuperação."
+msgstr ""
+"Corpo do primeiro e-mail, envie quando o usuário perguntar pela nova senha. "
+"Use %s para o login e o link de recuperação."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3381,7 +3107,9 @@ msgstr "Corpo (%s é o login)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Corpo do segundo e-mail, enviado para confirmar senha alterada. Use %s para Login de usuário. "
+msgstr ""
+"Corpo do segundo e-mail, enviado para confirmar senha alterada. Use %s para "
+"Login de usuário. "
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3390,7 +3118,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Olá,\n\nSua senha foi alterada.\nSeu login permanece %s."
+msgstr ""
+"Olá,\n"
+"\n"
+"Sua senha foi alterada.\n"
+"Seu login permanece %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3418,7 +3150,9 @@ msgstr "Idioma"
 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 "Idioma da aplicação. Se for \"automático\" ou indisponível, será utilizado o padrão do navegador. Essa configuração pode ser substituída pelo usuário. "
+msgstr ""
+"Idioma da aplicação. Se for \"automático\" ou indisponível, será utilizado o"
+" padrão do navegador. Essa configuração pode ser substituída pelo usuário. "
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3437,526 +3171,459 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Habilitar snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base de snapshots"
+
+#: plugins/config/class_configInLdap.inc:141
+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
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Comprimento mínimo de senha"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Habilitar snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base de snapshots"
-
-#: plugins/config/class_configInLdap.inc:237
-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:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Chave de pacote"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Caminho de certificado"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Porta"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Método de alocação de id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradicional"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Pool de id samba unix"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modo"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
-msgstr "Ganchos"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Ganchos"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4055,9 +3722,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4185,22 +3851,22 @@ msgstr "Gerenciar usuários"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Bloqueando conta"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Desbloquear conta"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Bloquear conta"
 
@@ -4246,7 +3912,7 @@ msgstr "Remover usuário"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4266,8 +3932,7 @@ msgid "Information"
 msgstr "Informação"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4291,164 +3956,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Adicionar usuários para a atribuição"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar propriedades do posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupo de objeto"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de confiança"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo de confiança"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desabilitado"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acesso total"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir acesso a esses servidores"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr ""
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4497,10 +4154,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4746,13 +4399,11 @@ msgstr "Clique no botão 'Próximo' quando tiver terminado."
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4760,51 +4411,53 @@ msgstr ""
 msgid "Close"
 msgstr "Fechar"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Caso você deseja saber o que será feito após migrar as entradas selecionada, use o botão 'Mostrar mudanças' para ver o LDIF."
+msgstr ""
+"Caso você deseja saber o que será feito após migrar as entradas selecionada,"
+" use o botão 'Mostrar mudanças' para ver o LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Mostrar mudanças"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Crie seu arquivo de configuração"
@@ -4896,7 +4549,9 @@ msgstr "Email"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "A recuperação de senha não foi ativada. Se você perdeu a sua senha, por favor, entre em contato com o administrador."
+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/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4906,7 +4561,9 @@ msgstr "Tela de login"
 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."
+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
@@ -4931,7 +4588,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "A opção de limite de tamanho faz com que as operações de LDAP fiquem mais rápidas e auxiliem o servidor à não sobrecarregar. A maneira mais fácil de lidar com banco de dados grandes sem longos timeouts, seria limitando sua pesquisa para valores menores e utilizando filtros para obter as entradas que você está procurando."
+msgstr ""
+"A opção de limite de tamanho faz com que as operações de LDAP fiquem mais "
+"rápidas e auxiliem o servidor à não sobrecarregar. A maneira mais fácil de "
+"lidar com banco de dados grandes sem longos timeouts, seria limitando sua "
+"pesquisa para valores menores e utilizando filtros para obter as entradas "
+"que você está procurando."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4939,13 +4601,16 @@ msgstr "Por favor, escolha a maneira de reação para esta sessão"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "Ignorar este erro e mostrar todas as entradas retornadas pelo servidor LDAP."
+msgstr ""
+"Ignorar este erro e mostrar todas as entradas retornadas pelo servidor LDAP."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "Ignorar este erro e mostrar todas as entradas que se enquadram no limite de tamanho definido, e me deixar utilizar filtros ao invés. "
+msgstr ""
+"Ignorar este erro e mostrar todas as entradas que se enquadram no limite de "
+"tamanho definido, e me deixar utilizar filtros ao invés. "
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4960,12 +4625,16 @@ msgstr ""
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Se você tem certeza, pressione 'Delete' para continuar ou 'Cancel' para "
+"desistir."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5036,17 +4705,25 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Alguns valores precisam ser únicos no diretório completo caso algumas combinações não façam sentido. FusionDirectory mostra os atributos relevantes. Favor manter os valores abaixo para satisfazer os critérios."
+msgstr ""
+"Alguns valores precisam ser únicos no diretório completo caso algumas "
+"combinações não façam sentido. FusionDirectory mostra os atributos "
+"relevantes. Favor manter os valores abaixo para satisfazer os critérios."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Lembre-se que algumas propriedades como a de snapshots tirados não serão copiadas!"
+msgstr ""
+"Lembre-se que algumas propriedades como a de snapshots tirados não serão "
+"copiadas!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Ou se você copiar ou recortar um registro com FusionDirectory e deletar o objeto fonte, você provavelmente encontrará erros enquanto cola este objeto novamente!"
+msgstr ""
+"Ou se você copiar ou recortar um registro com FusionDirectory e deletar o "
+"objeto fonte, você provavelmente encontrará erros enquanto cola este objeto "
+"novamente!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index b37bee3e8c883d4fcb1cb80f2fab4ebbef88dbd1..50fca402be3133c13b6f569de143fcb5fe80452a 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -1,945 +1,866 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015-2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "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"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Предпочитаемый язык"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Настройка языка"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Этот шаг позволяет выбрать предпочитаемый вами язык."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
-msgstr "В этом месте вы можете выбрать язык по умолчанию для всего сайта. При выборе \"автоматически\" будет и использоваться язык запрошенный браузером. Эта настройка может быть переопределена для каждого пользователя."
+msgstr ""
+"В этом месте вы можете выбрать язык по умолчанию для всего сайта. При выборе"
+" \"автоматически\" будет и использоваться язык запрошенный браузером. Эта "
+"настройка может быть переопределена для каждого пользователя."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Местоположение"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI подключения"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS соединение"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Ветка"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Аутентификация"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN администратора"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Пароль администратора"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Состояние"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Текущее состояние"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Настройки LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Настройки LDAP соединения"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Этот диалог выполняет основную настройку LDAP соединения для "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Сбой при анонимном привязывании к серверу '%s'!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Сбой при привязки под пользователем '%s'!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Retry"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Анонимное подключение (bind) а к серверу '%s' удалась."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Refresh"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Пожалуйста укажите пользователя и пароль!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Привязка под пользователем '%s' к серверу '%s' удалась!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Ошибка настройки"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Завершено"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Далее"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Добро пожаловать"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Готово"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Завершение - запишите конфигурационный файл"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Запись конфигурационного файла"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Конфигурационный файл доступе только для чтения. Пожалуйста обновите права "
+"на файл."
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Конфигурационный файл не читается или не существует вовсе."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"После скачивания и размещения файла в %s, убедитесь что пользователь из под "
+"которого запущен веб-сервера может читать %s, в то время как другие "
+"пользователи не должны."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Контроль за установкой"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Основная проверка совместимости PHP и расширений"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Проверка PHP версии"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP должен быть %s версии или старше"
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Пожалуйста обновитесь до поддерживаемой версии."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr "FusionDirectory требуется модуль для связи с вашим LDAP сервером."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr "FusionDirectory требуется модуль для интернационализации интерфейса."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirectory требуется этот модуль для взаимодействия с различными типами серверов и протоколов."
+msgstr ""
+"FusionDirectory требуется этот модуль для взаимодействия с различными типами"
+" серверов и протоколов."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory требуется модуль для интеграции с samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory требуется один из модулей 'mhash или 'sha1', чтобы использовать SSHA шифрование."
+msgstr ""
+"FusionDirectory требуется один из модулей 'mhash или 'sha1', чтобы "
+"использовать SSHA шифрование."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr "FusionDirectory требуется модуль для связи с IMAP сервером."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory требуется модуль для обработки юникод строк."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory требуется расширение для обработки изображений."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "модуль сжатия"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory требуется расширение для обработки снапшотов."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals механизм PHP, предоставляющий доступ ко всем глобальным переменным из скриптов без изменения области видимости. Это не безопасно."
+msgstr ""
+"register_globals механизм PHP, предоставляющий доступ ко всем глобальным "
+"переменным из скриптов без изменения области видимости. Это не безопасно."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Найдите 'register_globals' в вашем php.ini и переключите в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "Это значение используется PHP сборщиком мусора, чтобы удалять старые сессии."
+msgstr ""
+"Это значение используется PHP сборщиком мусора, чтобы удалять старые сессии."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Найдите 'session.gc_maxlifetime' в вашем php.ini и установите в 86400 или больше."
+msgstr ""
+"Найдите 'session.gc_maxlifetime' в вашем php.ini и установите в 86400 или "
+"больше."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Выкл"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "Чтобы во время использования FusionDirectory не возникло ни каких проблем, опция 'session.auto_start' должна быть установлена в 'Off' в вашем php.ini."
+msgstr ""
+"Чтобы во время использования FusionDirectory не возникло ни каких проблем, "
+"опция 'session.auto_start' должна быть установлена в 'Off' в вашем php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Найдите 'session.auto_start' в вашем php.ini и установите его в 'Off'."
+msgstr ""
+"Найдите 'session.auto_start' в вашем php.ini и установите его в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory нужно не меньше 128МБ памяти. Настройка этого предела ниже может привести к ошибкам, которые не воспроизводятся! Увеличьте его в большинстве случаев."
+msgstr ""
+"FusionDirectory нужно не меньше 128МБ памяти. Настройка этого предела ниже "
+"может привести к ошибкам, которые не воспроизводятся! Увеличьте его в "
+"большинстве случаев."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Найдите 'memory_limit' в вашем php.ini и установите его в '128M' или больше."
+msgstr ""
+"Найдите 'memory_limit' в вашем php.ini и установите его в '128M' или больше."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Найдите 'implicit_flush' в вашем php.ini и установите его в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Время исполнения, должно быть не менее 30 секунд."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Найдите 'max_execution_time' в вашем php.ini и установите его в значение '30' или больше."
+msgstr ""
+"Найдите 'max_execution_time' в вашем php.ini и установите его в значение "
+"'30' или больше."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Повысить безопасность сервера установив опцию expose_php в 'off'. PHP не будет отправлять ни какую информацию о сервере, запускающему, в этом случае."
+msgstr ""
+"Повысить безопасность сервера установив опцию expose_php в 'off'. PHP не "
+"будет отправлять ни какую информацию о сервере, запускающему, в этом случае."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Найдите 'expose_php' в вашем php.ini и установите в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Повысите производительность вашего сервер установив setting magic_quotes_gpc в 'off'."
+msgstr ""
+"Повысите производительность вашего сервер установив setting magic_quotes_gpc"
+" в 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Найдите 'zend.ze1_compatibility_mode' в вашем php.ini и установите в 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Добро пожаловать"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Добро пожаловать в мастер настройки FusionDirectory!"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Сообщение приветствия"
+msgstr ""
+"Найдите 'zend.ze1_compatibility_mode' в вашем php.ini и установите в 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Перемещение"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Инспекция LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Анализ вашего текущего LDAP для совместимости с FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Дать полные права на пользователей в выбранной ветке"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Проверка прав для LDAP базы"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Проверка на невидимых пользователей"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Проверка для супер администратора"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Проверка на пользователей за пределами дерева людей"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Проверка на группы за пределами дерева для них"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Проверка на невидимые подразделения"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "LDAP запрос не удался"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Ошибка"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Пропущен объектный класс FusionDirectory '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Пожалуйста проверьте вашу установку."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Найден пользователь(и) %s, которые будут не видны в FusionDirectory или которые не полные."
+msgstr ""
+"Найден пользователь(и) %s, которые будут не видны в FusionDirectory или "
+"которые не полные."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Найдена учетная запись администратора FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Найдена административная группа FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr "Нет рабочей учетной записи администратора FusionDirectory 1.0.8 в вашем LDAP."
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Создать"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Пользователи"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Группы"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Роли"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Нет учетной записи администратора FusionDirectory в вашем LDAP."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Создать"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Ошибка"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "ACL ролей по умолчанию не вставлены"
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Некоторые ACL ролей по умолчанию пропущены"
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "ACL ролей по умолчанию вставлен"
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Переместить пользователей в настроенное дерево пользователей"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Следующие ссылки будут обновлены"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Найдены группы %s, выходящие за пределы настроенного дерева '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr "Найдены подразделение(я) %s, которые будет не видны в FusionDirectory."
+msgstr ""
+"Найдены подразделение(я) %s, которые будет не видны в FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Местоположение"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI подключения"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS соединение"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Ветка"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Аутентификация"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN администратора"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Пароль администратора"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Состояние"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Текущее состояние"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Настройки LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Настройки LDAP соединения"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Этот диалог выполняет основную настройку LDAP соединения для FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Сбой при анонимном привязывании к серверу '%s'!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Сбой при привязки под пользователем '%s'!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Повторить"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Анонимное подключение (bind) а к серверу '%s' удалась."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Обновить"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Пожалуйста укажите пользователя и пароль!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Привязка под пользователем '%s' к серверу '%s' удалась!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Готово"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Завершение - запишите конфигурационный файл"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Запись конфигурационного файла"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Конфигурационный файл доступе только для чтения. Пожалуйста обновите права на файл."
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Конфигурационный файл не читается или не существует вовсе."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "После скачивания и размещения файла в %s, убедитесь что пользователь из под которого запущен веб-сервера может читать %s, в то время как другие пользователи не должны."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Ошибка настройки"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Завершено"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Добро пожаловать в мастер настройки FusionDirectory!"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Далее"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Сообщение приветствия"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Не удалось войти: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "Указанный объектный тип пустой или неверный!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "Не настроено"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Ошибка фильтра"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Фильтр неполный!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Права"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Ошибка доступа"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Вам не разрешено создавать снапшот для %s."
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Вам не разрешено восстанавливать снапшот для %s."
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "В конфигурационном файле не найдено объявление вкладки для '%s'. Не могу создать экземпляр плагина!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Отправить"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "По убыванию"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Вниз"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr "Сортировать по возврастанию"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr "Сортировать по убыванию"
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Выбрать все"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Ошибка"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "создано"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Перейти в корень подразделений"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Перейти вверх на одно подразделение"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr "Перейти к подразделению пользователя"
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Обновить список"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Действия"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Копировать"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Вырезать"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Вставить"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Вырезать эту запись"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Копировать эту запись"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Восстановить снапшоты"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Экспортировать список"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Восстановить снапшот"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Создать снапшот"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Создать новый снапшот из объекта"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Фатальная ошибка"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "в"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "на строке"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "Ошибка XML"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -951,12 +872,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
@@ -980,310 +901,303 @@ msgstr "CSV"
 #: include/class_session.inc:50 include/class_session.inc:88
 #: include/class_session.inc:127
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Запрашиваемый канал не существует! Пожалуйста свяжитесь с вашим системным администратором."
+msgstr ""
+"Запрашиваемый канал не существует! Пожалуйста свяжитесь с вашим системным "
+"администратором."
+
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Права"
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Отменить все"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Не могу вставить"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Имя пользователя"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Шаблон"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Название шаблона"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Критическая ошибка: не могу создать экземпляр класса '%s' - попробуйте запустить '%s' чтобы исправить это"
+msgstr ""
+"Критическая ошибка: не могу создать экземпляр класса '%s' - попробуйте "
+"запустить '%s' чтобы исправить это"
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Фатальная ошибка"
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATAL: Ошибка при подключении к LDAP. Сервер сообщил '%s'."
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
-msgstr "Логин (uid) не уникальный внутри LDAP дерева! Пожалуйста свяжитесь с вашим администратором."
+msgstr ""
+"Логин (uid) не уникальный внутри LDAP дерева! Пожалуйста свяжитесь с вашим "
+"администратором."
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Ошибка аутентификации"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Ошибка при добавлении блокировки. Свяжитесь с разработчиками!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Невозможно создать информацию о блокировки в LDAP дереве. Пожалуйста свяжитесь с вашим администратором!"
+msgstr ""
+"Невозможно создать информацию о блокировки в LDAP дереве. Пожалуйста "
+"свяжитесь с вашим администратором!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP сервер вернул: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Найдены множественные блокировки для заблокированного объекта. Это не должно было случиться - очистите их."
+msgstr ""
+"Найдены множественные блокировки для заблокированного объекта. Это не должно"
+" было случиться - очистите их."
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr "Установить новое значение лимита в %s и показать мне это сообщение если лимит будет исчерпан."
+msgstr ""
+"Установить новое значение лимита в %s и показать мне это сообщение если "
+"лимит будет исчерпан."
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Продолжить в любом случае"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Редактировать в любом случае"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь редактировать LDAP запись/записи %s"
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr "Записей на странице"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Применить фильтр"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Файл '%s' не может быть удален. Попробуйте fusiondirectory-setup --check-directories чтобы исправить права."
+msgstr ""
+"Файл '%s' не может быть удален. Попробуйте fusiondirectory-setup --check-"
+"directories чтобы исправить права."
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Не могу записать файл проверки!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Не могу прочитать файл проверки!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Предупреждение LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr "Не могу получить информацию о схемах с сервера. Проверить схемы невозможно!"
+msgstr ""
+"Не могу получить информацию о схемах с сервера. Проверить схемы невозможно!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Доступные класс(ы)"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Не могу выделить свободный ID:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr " неизвестный idAllocation метод!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool не уникальна!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "нет доступных ID!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "Превышено максимальное число попыток!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Не могу выделить свободный ID!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Не могу обнаружить файл '%s' - пожалуйста запустите '%s', чтобы исправить это."
+msgstr ""
+"Не могу обнаружить файл '%s' - пожалуйста запустите '%s', чтобы исправить "
+"это."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Все объекты в этой категории"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Пожалуйста исправьте ошибку выше и обновите страницу."
 
@@ -1292,46 +1206,48 @@ msgstr "Пожалуйста исправьте ошибку выше и обн
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Настройка часового пояса '%s' в вашей конфигурации не правильная."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr "Не могу привязаться к LDAP. Пожалуйста свяжитесь с системным администратором."
+msgstr ""
+"Не могу привязаться к LDAP. Пожалуйста свяжитесь с системным "
+"администратором."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "Функционал снапшотов включен, но требуемая переменная '%s' не установлена."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "Функционал снапшотов включен, но требуемый модуль сжатия отсутствует. Пожалуйста установите '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Все категории"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Моя учетная запись"
 
@@ -1354,7 +1270,7 @@ msgstr "Выбрать список объекто у которых включ
 msgid "Select to search within subtrees"
 msgstr "Выберите для поиска внутри поддеревьев"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Искать в поддеревьях"
 
@@ -1603,8 +1519,7 @@ msgid "Missing %s PHP extension!"
 msgstr "Пропущено %s PHP расширение!"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1612,7 +1527,7 @@ msgid "Cancel"
 msgstr "Отмена"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Применить"
@@ -1668,255 +1583,270 @@ msgstr "Для этой учетной записи нет корректных
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "В этой учетной записи настройки %s включены. Вы можете отключить их, щелкнув ниже."
+msgstr ""
+"В этой учетной записи включены %s настройки. Вы можете отключить их, щелкнув"
+" ниже."
 
 #: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-msgstr "В этой учетной записи настройки %s включены. Чтобы отключить еë, вам нужно вначале удалить настройки %s!"
+msgstr ""
+"В этой учетной записи настройки %s включены. Чтобы отключить еë, вам нужно "
+"вначале удалить настройки %s!"
 
 #: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "В этой учетной записи настройки %s отключены. Вы можете включить их, щелкнув ниже."
+msgstr ""
+"В этой учетной записи отключены %s настройки. Вы можете включить их, щелкнув"
+" ниже."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr "В этой учетной записи настройки %s отключены. Чтобы включить её, вам нужно вначале добавить настройки для %s."
+msgstr ""
+"В этой учетной записи настройки %s отключены. Чтобы включить её, вам нужно "
+"вначале добавить настройки для %s."
+
+#: include/class_msgPool.inc:614
+#, 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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Добавить параметры %s"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Удалить параметры %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Январь"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Февраль"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Март"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Апрель"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Май"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Июнь"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Июль"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Август"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Сентябрь"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Октябрь"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Ноябрь"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Декабрь"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Понедельник"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Среда"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Четверг"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Пятница"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Суббота"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Сбой при выполнении операции в базе данных!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "операция чтения"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "операция добавления"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "операция изменения"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "операция удаления"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "операция поиска"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "аутентификация"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Сбой при выполнении операции в LDAP!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Объект"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Сбой при загрузке!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Сбой при загрузке: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' по-прежнему используется этим объектом: %s"
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' по-прежнему используется."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' по-прежнему используется этими объектами: %s"
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Файл '%s' не существует!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Не могу открыть файл '%s' для чтения!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Не могу открыть файл '%s' для записи!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "Значение для '%s' до сих пор не настроено или неверно, пожалуйста проверьте ваш конфигурационный файл!"
+msgstr ""
+"Значение для '%s' до сих пор не настроено или неверно, пожалуйста проверьте "
+"ваш конфигурационный файл!"
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Не могу удалить файл '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Не могу создать папку '%s'!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Не могу удалить папку '%s'!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Проверка поддержки %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Установите и активируйте %s PHP модуль."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Установите и активируйте %s Pear модуль."
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Не могу инициализировать класс '%s'! Может быть какой то плагин пропущен в настройках FusionDirectory?"
+msgstr ""
+"Не могу инициализировать класс '%s'! Может быть какой то плагин пропущен в "
+"настройках FusionDirectory?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1958,7 +1888,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Снапшоты"
 
@@ -2008,7 +1937,8 @@ msgstr "Аргументы"
 
 #: include/php_setup.inc:231
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr "Создание этой страницы помогла PHP интерпретатору выявить некоторые ошибки!"
+msgstr ""
+"Создание этой страницы помогла PHP интерпретатору выявить некоторые ошибки!"
 
 #: include/php_setup.inc:236
 msgid "Send bug report to the FusionDirectory Team"
@@ -2022,81 +1952,87 @@ msgstr "Отправить отчет об ошибке"
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Предупреждение о производительности"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "Низкая производительность LDAP: последний запрос занял около %.2fs!"
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "во время операции на '%s' использовался LDAP сервер '%s'"
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "во время операции на LDAP сервер %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Пожалуйста выберете нужные записи"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2104,13 +2040,12 @@ msgstr "Название"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Описание"
@@ -2121,11 +2056,13 @@ msgid "POSIX group %s"
 msgstr "POSIX группа %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr "Роль %s"
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr "Группа %s"
@@ -2162,8 +2099,8 @@ msgstr "Изменить"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2172,130 +2109,154 @@ msgstr "Изменить"
 msgid "Remove"
 msgstr "Удалить"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Процесс удаления был отменен плагином '%s': %s"
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr "Не удалось переместить из \"%s\" в \"%s\""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "секунды"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr "минуты"
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "часы"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "дни"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr "Из шаблона"
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr "шаблон %s "
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Показать %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Ошибка фильтра"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Фильтр неполный!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Ошибка доступа"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Вам не разрешено создавать снапшот для %s."
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Вам не разрешено восстанавливать снапшот для %s."
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr "Это название шаблона"
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Ошибка при сохранении"
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Уже есть запись с таким dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Запись %s не существует"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr "Вкладка \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Неизвестное поле \"%s\""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2335,8 +2296,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d байт)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -2345,7 +2306,7 @@ msgstr "Загрузить"
 msgid "Download"
 msgstr "Скачать"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2396,27 +2357,10 @@ msgstr "Вещественно число больше %f"
 msgid "A float smaller than %f"
 msgstr "Вещественное число меньше %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr "Были проблемы при распаковке данных снапшота"
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr "Вкладка \"%s\""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "Доступ"
@@ -2435,7 +2379,9 @@ msgstr "ACL ролей"
 msgid ""
 "Unkown ACL type '%s'!\n"
 "You might need to run \"fusiondirectory-setup --migrate-acls\" to migrate your acls to the new format."
-msgstr "Неизвестный тип ACL '%s'!\nВозможно вам нужно запустить \"fusiondirectory-setup --migrate-acls\", чтобы перенести ваши acls в новый формат."
+msgstr ""
+"Неизвестный тип ACL '%s'!\n"
+"Возможно вам нужно запустить \"fusiondirectory-setup --migrate-acls\", чтобы перенести ваши acls в новый формат."
 
 #: include/class_acl.inc:170
 #, php-format
@@ -2447,11 +2393,15 @@ msgstr "Неизвестная запись '%s'!"
 msgid "All users"
 msgstr "Все пользователи"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Применить фильтр"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2472,7 +2422,9 @@ msgstr ""
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "Не прочесть конфигурацию FusionDirectory %s/%s. Чтобы исправить это пожалуйста запустите  fusiondirectory-setup --check-config."
+msgstr ""
+"Не прочесть конфигурацию FusionDirectory %s/%s. Чтобы исправить это "
+"пожалуйста запустите  fusiondirectory-setup --check-config."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2520,40 +2472,39 @@ msgstr "Введите свой пароль!"
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
-msgstr "Учетная запись заблокирована. Пожалуйста свяжитесь с вашим системным администратором."
+msgstr ""
+"Учетная запись заблокирована. Пожалуйста свяжитесь с вашим системным "
+"администратором."
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "CAS пользователь \"%s\" не может быть найден в LDAP"
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr "CAS пользователь \"%s\" соответствует нескольким пользователям в LDAP"
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "В вашем браузере отключены куки. Пожалуйста включите их и обновите эту страницу перед входом в систему! "
+msgstr ""
+"В вашем браузере отключены куки. Пожалуйста включите их и обновите эту "
+"страницу перед входом в систему! "
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2591,13 +2542,15 @@ msgstr ""
 
 #: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Свяжитесь с вашим системным администратором, были проблемы с почтовым сервером"
+msgstr ""
+"Свяжитесь с вашим системным администратором, были проблемы с почтовым "
+"сервером"
 
 #: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Были проблемы с почтовым сервером, имэйл подтверждения не отправлены"
 
@@ -2609,7 +2562,9 @@ msgstr "Настройки PHP"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Критическая ошибка: Register globals is on. FusionDirectory не позволит залогиниться до тех пор пока это не будет исправлено администратором."
+msgstr ""
+"Критическая ошибка: Register globals is on. FusionDirectory не позволит "
+"залогиниться до тех пор пока это не будет исправлено администратором."
 
 #: html/main.php:142
 msgid "Password change"
@@ -2617,7 +2572,8 @@ msgstr "Изменить пароль"
 
 #: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
-msgstr "Срок действия вашего пароля почти закончился, пожалуйста измените его!"
+msgstr ""
+"Срок действия вашего пароля почти закончился, пожалуйста измените его!"
 
 #: html/main.php:158
 msgid "Your password has expired, please set a new one."
@@ -2651,7 +2607,9 @@ msgstr ""
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Критическая ошибка: не все POST переменные переданы в PHP - пожалуйста сообщите вашему системному администратору!"
+msgstr ""
+"Критическая ошибка: не все POST переменные переданы в PHP - пожалуйста "
+"сообщите вашему системному администратору!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2664,225 +2622,8 @@ msgstr "Добро пожаловать %s!"
 msgid "References"
 msgstr "Ссылки"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Редактировать POSIX настройки пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Домашний каталог"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Путь к домашнему каталогу пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Оболочка"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Какой шелл должен использоваться, когда пользователь заходит в систему"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Основная группа"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Основная группа пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Статус учетной записи unix у пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr "Принудительный id пользователя/группы"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr "Навязанное значение идентификатора пользователя и группы для этого пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr "Id пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr "Значение идентификатора пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr "Id группы"
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr "Значение идентификатора группы"
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Членство в группах"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Учетная запись"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Пользователь должен сменить пароль при первом входе в систему"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr "Пользователь должен будет изменить пароль при первом входе (нужно указать значение для \"Задержка до принудительного изменения пароля\")"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr "Минимальная задержка между изменениями пароля (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Задержка до принудительного изменения пароля (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "У пользователя насильно будет изменен пароль после указанного количества дней (оставить пустым, чтобы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Дата окончания действия пароля"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Дата после которой пароль пользователя истечет (оставить пустым что бы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Через сколько отключать пользователя (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Сколько подождать до отключения пользователя, после истечения пароля (оставить пустым, чтобы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "За сколько предупреждать об окончании действия пароля (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "Предупреждать пользователя об окончании действия его пароля за указанное количество дней (оставить пустым, чтобы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Системные доверия"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Режим доверия"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Тип авторизации для этих хостов"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "отключен"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "полный доступ"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "разрешить доступ только на эти хосты"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Пользователю разрешено подключаться только к хостам из списка"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "автоматически"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "Истек"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "активный"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "срок действия параля истек"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "Пароль не изменяем"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Время ожидания блокировки истекло. Игнорирование блокировки!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr "Группа пользователя %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Группы и роли"
 
@@ -2909,7 +2650,7 @@ msgid "Password hash method to use"
 msgstr "Применяемый метод для хэша пароля"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2930,278 +2671,294 @@ msgstr "Пароль еще раз"
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Пользователь"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr "Информация об учетной записи пользователя"
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr "Учетная запись пользователя"
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Фамилия"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Фамилия пользователя"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Имя"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Имя пользователя"
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Краткое описание пользователя"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Фотография"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Аватар пользователя"
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Рабочая контактная информация"
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Местоположение"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Адм. единица"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Адрес"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Рабочий почтовый адрес"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Телефон"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Рабочий номер телефона"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Рабочий номер мобильного телефона"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Рабочий номер пейджера"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Факс"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Рабочий номер факса"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Персональная домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Информация об учетной записи"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Логин этого пользователя"
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Пароль пользователя"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Личная контактная информация"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Отображаемое имя"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Домашний адрес"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Домашний почтовый адрес"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Заголовок"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Организация"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Номер отдела"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Номер работника"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Руководитель"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Почтовый индекс"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Вам не разрешено изменять свой пароль"
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Вы должны подождать %d секунд перед повторным изменением пароля"
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Пароль присутствует в истории старых паролей"
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Новый пароль"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Новый и текущий пароли слишком похожи."
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "Новый пароль слишком короткий."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Пароль содержит символы Unicode, которые могут проблемы!"
 
@@ -3287,7 +3044,8 @@ msgstr "Ссылка действительна (минуты)"
 
 #: plugins/config/class_recoveryConfig.inc:59
 msgid "Number of minutes before a recovery link expires"
-msgstr "Количество минут до истечения срока годности ссылки для восстановление "
+msgstr ""
+"Количество минут до истечения срока годности ссылки для восстановление "
 
 #: plugins/config/class_recoveryConfig.inc:65
 msgid "Salt for tokens"
@@ -3297,7 +3055,9 @@ msgstr "Соль для токенов"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Просто мера безопасности, вы можете вставить сюда все что угодно, даже случайные символы"
+msgstr ""
+"Просто мера безопасности, вы можете вставить сюда все что угодно, даже "
+"случайные символы"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3307,10 +3067,12 @@ msgstr "Разрешить исользование альтернативных
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Пользователям также нужно ввести один из их дополнительных адресов для восстановления пароля"
+msgstr ""
+"Пользователям также нужно ввести один из их дополнительных адресов для "
+"восстановления пароля"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Атрибут для входа"
 
@@ -3346,7 +3108,9 @@ msgstr "Тело (вначале логин %s, вторая ссылка)"
 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 "Тело первого письма, отправляется когда пользователь запрашивает новый пароль. Использует %s логин и ссылку для восстановления."
+msgstr ""
+"Тело первого письма, отправляется когда пользователь запрашивает новый "
+"пароль. Использует %s логин и ссылку для восстановления."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3382,7 +3146,9 @@ msgstr "Тело (%s логин)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Тело второго письма, отправляется, чтобы подтвердить, что пароль был  изменен. Использует %s логин пользователя."
+msgstr ""
+"Тело второго письма, отправляется, чтобы подтвердить, что пароль был  "
+"изменен. Использует %s логин пользователя."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3391,7 +3157,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Привет,\n\nВаш пароль был изменен.\nВаш логин по прежнему %s."
+msgstr ""
+"Привет,\n"
+"\n"
+"Ваш пароль был изменен.\n"
+"Ваш логин по прежнему %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3419,7 +3189,10 @@ msgstr "Язык"
 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 "Язык приложения. Если 'автоматически' или отсутствует, тогда будет спрошено у браузера какой использовать. Эта настройка может быть переопределена каждым пользователем."
+msgstr ""
+"Язык приложения. Если 'автоматически' или отсутствует, тогда будет спрошено "
+"у браузера какой использовать. Эта настройка может быть переопределена "
+"каждым пользователем."
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3438,527 +3211,478 @@ msgid "Timezone to be used"
 msgstr "Часовой пояс, который будет использован"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Настройка схемы"
+msgid "Core settings"
+msgstr "Основные настройки"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Ограничение размера LDAP"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Определяет количество записей, которые можно получить из LDAP по умолчанию."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Блокировка редактирования"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Проверьте, не была ли редактируемая вами запись изменена вне FusionDirectory"
+" в это же время."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Включить логирование"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Регистрация событий на стороне FusionDirectory"
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Включить проверку схемы при входе."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Включить снапшоты"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Это позволяет сохранять определенное состояние записей и позже его "
+"восстанавливать."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Базовая запись снапшотов"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "Базовая запись, где снапшоты должны будут храниться внутри LDAP."
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Настройки пароля"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Метод хеширования пароля по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Используемый по умолчанию метод хеширования пароля"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Заставлять использовать хеш по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Принуждать использовать метод хеширования пароля по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Минимальная длина пароля"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Минимальная длинна пароля пользователя"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Минимальная разница в паролях"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Минимальное количество отличных символов от последнего пароля"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Использовать учетные записи с истекающим сроком действия"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Основные настройки"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Показать краткую информацию о списках"
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr "Блокировка редактирования"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Проверьте, не была ли редактируемая вами запись изменена вне FusionDirectory в это же время."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Включить логирование"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Регистрация событий на стороне FusionDirectory"
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Ограничение размера LDAP"
+msgid "SASL Exop"
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Определяет количество записей, которые можно получить из LDAP по умолчанию."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Вход в систему и сессии"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
-msgstr "Какой LDAP атрибут необходимо использовать в качестве логина при входе в систему."
+msgstr ""
+"Какой LDAP атрибут необходимо использовать в качестве логина при входе в "
+"систему."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Принудительно шифровать соединения"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Принудительно использовать шифрованный доступ (https) к веб интерфейсу, включив проверку безопасности PHP."
+msgstr ""
+"Принудительно использовать шифрованный доступ (https) к веб интерфейсу, "
+"включив проверку безопасности PHP."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Предупреждать если сеанс не зашифрован"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
-msgstr "будут отображаться предупреждения для пользователя, когда http будет использоваться вместо https."
+msgstr ""
+"будут отображаться предупреждения для пользователя, когда http будет "
+"использоваться вместо https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Время жизни сессии"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Включить снапшоты"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Это позволяет сохранять определенное состояние записей и позже его восстанавливать."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Базовая запись снапшотов"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "Базовая запись, где снапшоты должны будут храниться внутри LDAP."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Путь к сертификату CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Включить CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Хост"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Порт"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Местоположение пользователей и групп"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "DN атрибут пользователя"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Атрибут используемый у пользователей в начале dn"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Политика строго присваивания имен"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Включить строгую проверку имен для пользователей и групп"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Минимальный id групп/пользователей"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr "Наименьший идентификатор пользователя или группы, который может быть назначен, чтобы избежать дыры в безопасности с идентификатором учетной записи равным 0."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr "Скрипт, который будет вызваться при нахождении следующего свободного номера id для пользователей иил групп."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Начальное значение для id пользователя"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Откуда начинать смотреть значение для нового свободного id пользователя."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Начальное значение для id группы"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Откуда начинать смотреть значение для нового свободного id группы."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr " RDN пользователей"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Ветка где пользователели хранятся."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "RDN групп"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Ветка в которой хранятся группы."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "RDN для ACL ролей"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Ветка в которой хранятся ACL ролей."
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Метод выделения id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Метод выделения идентификаторов для пользователей и групп"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Традиционный"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Пул id для samba и unix"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Минимальное значение id пользователей в пуле"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Минимальное значение для id пользователя, при использовании пул метода"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Максимальное значение id пользователя в пуле"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Максимальное значение для id пользователя, при использовании пул метода"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Минимальное значение id группы в пуле"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Минимальное значение для id группы, при использовании пул метода"
+#: 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:372
-msgid "Pool group id max"
-msgstr "Максимальное значение id группы в пуле"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Максимальное значение для id группы, при использовании пул метода"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Отладка"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Отображение ошибок"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "Показывать PHP ошибки в верхней части экрана. Следует отключить при рабочем использовании, потому что там могут быть отображены пароли."
+msgstr ""
+"Показывать PHP ошибки в верхней части экрана. Следует отключить при рабочем "
+"использовании, потому что там могут быть отображены пароли."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Максимальное время LDAP запроса"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Остановить работу с LDAP если нет ответа за определенное количество секунд."
+msgstr ""
+"Остановить работу с LDAP если нет ответа за определенное количество секунд."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Лог статистики обращений к LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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 "Отслеживать продолжительность обращений к LDAP в syslog. Это может помочь найти проблемы в индексировании и плохих фильтров поиска."
+msgstr ""
+"Отслеживать продолжительность обращений к LDAP в syslog. Это может помочь "
+"найти проблемы в индексировании и плохих фильтров поиска."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Уровень отладки"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Отображать следующую информацию при каждой загрузке странице."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Показать краткую информацию о списках"
+
+#: 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:424
-msgid "tab"
-msgstr "вкладка"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "Показать вкладку ACL для всех объектов."
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: 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:429
-msgid "mode"
-msgstr "Режим"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr "Доступные категории подразделений"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
-msgstr "Когда вызывать эту команду"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr "Доступные категории подразделений в раскрывающемся списке"
+
+#: 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:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
-msgstr "Команда, которая будет вызвана"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
 msgid "Hooks"
 msgstr "Хуки"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Доступные оболочки"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Доступные POSIX шеллы для пользователей FD"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Режим"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
+msgstr "Когда вызывать эту команду"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Показать вкладку ACL для всех объектов."
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr "Команда, которая будет вызвана"
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr "Доступные категории подразделений"
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr "Доступные категории подразделений в раскрывающемся списке"
+#: 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_pluginsConfigInLdap.inc:29
 msgid "Plugins"
@@ -4028,7 +3752,8 @@ msgstr "Префиксы"
 
 #: plugins/config/class_dashBoardConfig.inc:51
 msgid "Prefixes to be used for computer ids"
-msgstr "Префексы, которые будут использоваться для идентификаторов компьютеров"
+msgstr ""
+"Префексы, которые будут использоваться для идентификаторов компьютеров"
 
 #: plugins/config/class_dashBoardConfig.inc:59
 msgid "Dashboard expired users"
@@ -4056,9 +3781,8 @@ msgstr "отдел"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4124,7 +3848,7 @@ msgstr "Номер факса"
 
 #: plugins/admin/departments/class_organization.inc:51
 msgid "organization"
-msgstr "организации"
+msgstr "организация"
 
 #: plugins/admin/departments/class_domain.inc:30
 #: plugins/admin/departments/class_domain.inc:31
@@ -4144,7 +3868,9 @@ msgstr "Управление подразделениями"
 msgid ""
 "Manage departments, countries, domain components, domains, localities and "
 "organization nodes,"
-msgstr "Управление подразделениями, странами, доменными компонентами, доменами, местоположениями и организационными удиницами"
+msgstr ""
+"Управление подразделениями, странами, доменными компонентами, доменами, "
+"местоположениями и организационными удиницами"
 
 #: plugins/admin/departments/class_departmentManagement.inc:38
 msgid "Users and groups"
@@ -4186,22 +3912,24 @@ msgstr "Управление пользователями"
 msgid "Manage user accounts and their properties"
 msgstr "Управление аккаунтами пользователей и их свойствами"
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Блокировка учётной записи"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
-msgstr "Парольный метод \"%s\" не поддерживает блокирование. Аккаунт \"%s\" не будет заблокирован!"
+msgstr ""
+"Парольный метод \"%s\" не поддерживает блокирование. Аккаунт \"%s\" не будет"
+" заблокирован!"
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "Разблокировать акаунт"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "Заблокировать акаунт"
 
@@ -4247,7 +3975,7 @@ msgstr "Удалить пользователя"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4267,8 +3995,7 @@ msgid "Information"
 msgstr "Информация"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Название этой группы"
 
@@ -4292,128 +4019,149 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Добавить пользователей для роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Управление группами и ролями"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr "Управление объектами группы, POSIX группы и роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Редактировать свойства роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Редактировать posix свойства"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Показать группы пользователей"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Показать основные группы"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Показать организационные роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Показать группы приложений"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr "Показать неопознанные группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Показать основные группы"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Показывать группы mail"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Показать группы samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Показать группы серверов"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Показать группы рабочих станций"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Показать группы рабочих станций с Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Показать группы терминалов"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Показать группы принтеров"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Показать группы телефонов"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Неизвестный тип: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Не существующий dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Объект группы"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Информация об объекте группы"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Краткое описание группы"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Включаемые объекты"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Объекты, члены этой группы"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Системные доверия"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Режим доверия"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Тип авторизации для этих хостов"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "отключен"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "полный доступ"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "разрешить доступ только на эти хосты"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Позволить подключаться этой группе только к хостам из списка"
 
-#: plugins/admin/groups/class_ogroup.inc:322
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4422,35 +4170,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Список групп"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr "Информация об POSIX группе"
-
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr "POSIX группа"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
-
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Указать GID вручную"
-
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
-msgstr "Указать значение GID для группы"
-
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
-msgstr "GID значение для этой группы"
-
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Члены группы"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4498,10 +4217,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr "Диалог назначения ролей управления доступом"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Режим"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Применить это действие ко всему поддереву или только к его основе?"
@@ -4665,7 +4380,8 @@ msgstr "ACLs, которые являются частью этой группы
 
 #: setup/setup_checks.tpl.c:11
 msgid "FusionDirectory will NOT run without fixing this."
-msgstr "FusionDirectory НЕ сможет продолжить работу без исправления этой ошибки."
+msgstr ""
+"FusionDirectory НЕ сможет продолжить работу без исправления этой ошибки."
 
 #: setup/setup_checks.tpl.c:14
 msgid "FusionDirectory will run without fixing this."
@@ -4679,7 +4395,9 @@ msgstr "Создать новую учетную запись администр
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Этот диалог автоматически добавит нового суперадминистратора в ваше дерево LDAP,"
+msgstr ""
+"Этот диалог автоматически добавит нового суперадминистратора в ваше дерево "
+"LDAP,"
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4694,7 +4412,9 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Похоже, что вы запустили FusionDirectory впервые, поскольку мы не смогли найти ни одной конфигурации. Этот простой мастер поможет вам в настройке."
+msgstr ""
+"Похоже, что вы запустили FusionDirectory впервые, поскольку мы не смогли "
+"найти ни одной конфигурации. Этот простой мастер поможет вам в настройке."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4710,7 +4430,9 @@ msgstr "Пробую найти проблемы с настройками PHP 
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr "Позволяет вам выбрать из набора основных и расширенных переключателей конфигурации"
+msgstr ""
+"Позволяет вам выбрать из набора основных и расширенных переключателей "
+"конфигурации"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -4737,7 +4459,10 @@ msgid ""
 "For security reasons you need to authenticate for the installation by "
 "creating the file '%1', containing the current session ID on the servers "
 "local filesystem. This can be done by executing the following command:"
-msgstr "Для обеспечения безопасности установки вам нужно подтвердить подлинность, создав на сервере файл '%1', содержащий ID сессии. Для этого выполните следующую команду: "
+msgstr ""
+"Для обеспечения безопасности установки вам нужно подтвердить подлинность, "
+"создав на сервере файл '%1', содержащий ID сессии. Для этого выполните "
+"следующую команду: "
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -4747,13 +4472,11 @@ msgstr "По завершении нажмите кнопку \"Далее\""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "После миграции"
 
@@ -4761,51 +4484,62 @@ msgstr "После миграции"
 msgid "Close"
 msgstr "Закрыть"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Во время осмотра LDAP мы собираемся проанализировать некоторые типичные "
+"ошибки, возникающие в процессе переноса FusionDirectory LDAP "
+"администратором. Вы можете исправить найденные проблемы, чтобы обеспечить "
+"стабильную работу служб."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Проверить снова"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
-msgstr "Этот диалог позволяет переместить несколько записей в дереве конфигурации. Эти действия могут привести в порядок ваш LDAP сервер."
+msgstr ""
+"Этот диалог позволяет переместить несколько записей в дереве конфигурации. "
+"Эти действия могут привести в порядок ваш LDAP сервер."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr "Переместить выделенные записи внутрь дерева"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
-msgstr "Перечисленные записи сейчас не видны в интерфейсе FusionDirectory. Если вы хотите изменить это только для нескольких записей, просто выделите их и используйте кнопку 'Переместить' ниже."
+msgstr ""
+"Перечисленные записи сейчас не видны в интерфейсе FusionDirectory. Если вы "
+"хотите изменить это только для нескольких записей, просто выделите их и "
+"используйте кнопку 'Переместить' ниже."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Если вы хотите знать, что будет сделано при переселении выбранных записей, воспользуйтесь кнопкой 'Показать изменения', чтобы посмотреть на LDIF."
+msgstr ""
+"Если вы хотите знать, что будет сделано при переселении выбранных записей, "
+"воспользуйтесь кнопкой 'Показать изменения', чтобы посмотреть на LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Показать изменения"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Во время осмотра LDAP мы собираемся проанализировать некоторые типичные ошибки, возникающие в процессе переноса FusionDirectory LDAP администратором. Вы можете исправить найденные проблемы, чтобы обеспечить стабильную работу служб."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Проверить снова"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Создайте конфигурационный файл"
@@ -4844,7 +4578,9 @@ msgstr ""
 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 "Этот диалог предназначен для смены пароля. Введите новый пароль дважды в доступные ниже поля и нажмите кнопку \"Изменить\"."
+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
@@ -4881,7 +4617,9 @@ msgstr "Ваш пароль был успешно изменен."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr "Введите ваш текущий адрес электронной почты в нижние поле и нажмите кнопку 'Изменить'."
+msgstr ""
+"Введите ваш текущий адрес электронной почты в нижние поле и нажмите кнопку "
+"'Изменить'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:62
 msgid ""
@@ -4897,7 +4635,9 @@ msgstr "Email"
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "Функция восстановления пароля не активирована. Если вы потеряли пароль, обратитесь к системному администратору."
+msgstr ""
+"Функция восстановления пароля не активирована. Если вы потеряли пароль, "
+"обратитесь к системному администратору."
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4907,7 +4647,9 @@ msgstr "Окно входа"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr "Пожалуйста используйте свое имя и пароль что бы войти в систему администрирования сайтом."
+msgstr ""
+"Пожалуйста используйте свое имя и пароль что бы войти в систему "
+"администрирования сайтом."
 
 #: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
 #: ihtml/themes/breezy/login.tpl.c:14
@@ -4932,7 +4674,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "Ограничение на количество возвращаемых объектов позволяет ускорить операции поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ снизить время обработки запроса при обслуживаии большой базы данных это установить минимальное значение. Кроме того, будет очень полезно использовать фильтры для просмотра только ограниченного количества объектов."
+msgstr ""
+"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
+"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
+"снизить время обработки запроса при обслуживаии большой базы данных это "
+"установить минимальное значение. Кроме того, будет очень полезно "
+"использовать фильтры для просмотра только ограниченного количества объектов."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4966,7 +4713,9 @@ msgstr ""
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/remove.tpl.c:8
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Итак - если вы уверены - нажмите 'Удалить', чтобы продолжить или 'Отмена' чтобы прервать."
+msgstr ""
+"Итак - если вы уверены - нажмите 'Удалить', чтобы продолжить или 'Отмена' "
+"чтобы прервать."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5041,13 +4790,17 @@ msgstr ""
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Помните, что некоторые свойства, такие как сделанные снапшоты, не будут скопированы"
+msgstr ""
+"Помните, что некоторые свойства, такие как сделанные снапшоты, не будут "
+"скопированы"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Если вы скопируете или вырежете запись с помощью FusionDirectory и удалите исходный объект, вы можете получить ошибки при вставке этого объекта снова!"
+msgstr ""
+"Если вы скопируете или вырежете запись с помощью FusionDirectory и удалите "
+"исходный объект, вы можете получить ошибки при вставке этого объекта снова!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5155,23 +4908,25 @@ msgstr "Парольный метод не будет изменен!"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Вы успешно сменили свой пароль. Не забудьте изменить нужные настройки использующих его программ."
+msgstr ""
+"Вы успешно сменили свой пароль. Не забудьте изменить нужные настройки "
+"использующих его программ."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
 msgid_plural "There are %1 groups:"
-msgstr[0] "Есть %1 группа:"
-msgstr[1] "Есть %1 группы:"
-msgstr[2] "Есть %1 групп:"
-msgstr[3] "Есть %1 групп:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:5
 msgid "One of them is a %1 group"
 msgid_plural "%2 are %1 groups"
-msgstr[0] "У одной из них %1 группа"
-msgstr[1] "У %2 из них %1 группа"
-msgstr[2] "У %2 из них %1 группа"
-msgstr[3] "У %2 из них %1 группа"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:8
 msgid "There is no %1 group"
@@ -5181,18 +4936,18 @@ msgstr "Ни у кого нету %1 группы"
 #: plugins/addons/dashboard/pwd_stats.tpl.c:2
 msgid "There is 1 user:"
 msgid_plural "There are %1 users:"
-msgstr[0] "Есть %1 пользователь:"
-msgstr[1] "Есть %1 пользователя:"
-msgstr[2] "Есть %1 пользователей:"
-msgstr[3] "Есть %1 пользователей:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:5
 msgid "One of them have a %1 account"
 msgid_plural "%2 of them have a %1 account"
-msgstr[0] "У одного из них есть %1 аккаунт"
-msgstr[1] "У %2 из них есть %1 аккаунт"
-msgstr[2] "У %2 из них есть %1 аккаунт"
-msgstr[3] "У %2 из них есть %1 аккаунт"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: plugins/addons/dashboard/users_stats.tpl.c:8
 msgid "None of them have a %1 account"
@@ -5209,10 +4964,10 @@ msgstr[3] ""
 #: 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] "%1 из них заблокированы"
-msgstr[2] "%1 из них заблокированы"
-msgstr[3] "%1 из них заблокированы"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: plugins/addons/dashboard/pwd_stats.tpl.c:11
 msgid "None of them is locked"
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 86f7b183efdcc9b0bc897e8f66c0ecb5c34ae1c3..54804de672e2c47f3399a732a7ccbbcc4e1e1eaa 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -1,943 +1,829 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru@petr1708\n"
 "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"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr ""
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +835,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +866,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1152,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1214,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1463,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1471,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1543,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1820,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1883,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,11 +1987,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2030,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2040,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2227,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2237,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2288,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2322,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2399,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2471,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2538,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2566,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2587,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2983,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3088,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3662,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3791,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3852,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3872,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3896,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4094,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4339,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4351,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 6b35f483d63cce8866010fadfa6409c6853de02d..1a5b68054873879e3d3b1a8d16d6c3fa8cd42f9a 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -1,943 +1,877 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Föredraget språk"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Språkinställningar"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Det här steget låter dig välja ditt föredragna språk."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Location name"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "Koppling-URI"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS-koppling"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Bas"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Admin DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Adminlösenord"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Nuvarande status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "LDAP-inställningar"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "LDAP-koppling"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Den här dialogrutan utför den grundläggande konfigurationen för LDAP-"
+"kopplingen till FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonym koppling till server '%s' misslyckades!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Koppling som användare '%s' misslyckades!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Anonym koppling till servern '%s' lyckades."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Skriv in användare och lösenord!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Koppling som användare '%s' till servern '%s' lyckades!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Varning"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Installationsfel"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Slutförd"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Nästa"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Välkommen"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Slutför"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Slutför - skriv konfigurationsfil"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Skriv konfigurationsfil"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Din konfigurationsfil är just nu läsbar för alla användare. Vänligen "
+"uppdatera filrättigheterna!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Konfigurationen är just nu inte läsbar eller så finns den inte."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Efter att ha laddat ner och placerat filen under %s, vänligen säkerställ att"
+" användaren som webbservern kör med har rättigheter att läsa %s medan andra "
+"användare inte ska kunna det."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "PHP modul- och tilläggskontroll"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Installationskontroll"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Grundläggande kontroll för PHP-kompatibilitet och tillägg"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Kontrollerar PHP-version"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP måste vara version %s eller högre."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Vänligen uppgradera till en version som stöds."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr "FusionDirectory kräver den här modulen för att prata med din LDAP-server"
+msgstr ""
+"FusionDirectory kräver den här modulen för att prata med din LDAP-server"
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr "FusionDirectory kräver den här modulen för ett internationaliserat gränssnitt."
+msgstr ""
+"FusionDirectory kräver den här modulen för ett internationaliserat "
+"gränssnitt."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr "FusionDirecotyr kräver den här modulen för att kommunicera med olika typer av servrar och protokoll."
+msgstr ""
+"FusionDirecotyr kräver den här modulen för att kommunicera med olika typer "
+"av servrar och protokoll."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory kräver den här modulen för integrationen med Samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr "FusionDirectory kräver antingen en modul för antingen 'mhash' eller 'shah' för at kunna använda SSHA-kryptering."
+msgstr ""
+"FusionDirectory kräver antingen en modul för antingen 'mhash' eller 'shah' "
+"för at kunna använda SSHA-kryptering."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr "FusionDirectory kräver den här modulen för att kunna prata med en IMAP-server"
+msgstr ""
+"FusionDirectory kräver den här modulen för att kunna prata med en IMAP-"
+"server"
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr "FusionDirectory kräver den här modulen för att hantera unicode-strängar."
+msgstr ""
+"FusionDirectory kräver den här modulen för att hantera unicode-strängar."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory kräver det här tillägget för att hantera bilder."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "compression-modul"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr "FusionDirectory kräver det här tillägget för att hantera ögonblicksbilder"
+msgstr ""
+"FusionDirectory kräver det här tillägget för att hantera ögonblicksbilder"
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "register_globals är en PHP-mekanism för att registrera alla globala variabler så de är tillgängliga från skript utan att ändra scope. Detta kan vara en säkerhetsrisk."
+msgstr ""
+"register_globals är en PHP-mekanism för att registrera alla globala "
+"variabler så de är tillgängliga från skript utan att ändra scope. Detta kan "
+"vara en säkerhetsrisk."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Sök efter 'register_globals' i din php.ini och ställ in den som 'Off'."
+msgstr ""
+"Sök efter 'register_globals' i din php.ini och ställ in den som 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP använder det här värdet för garage collection för att ta bort gamla sessioner"
+msgstr ""
+"PHP använder det här värdet för garage collection för att ta bort gamla "
+"sessioner"
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Att ställa in det här värdet till en dag kommer att förhindra förlust av sessioner och cookies innan de verkligen når time out."
+msgstr ""
+"Att ställa in det här värdet till en dag kommer att förhindra förlust av "
+"sessioner och cookies innan de verkligen når time out."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Sök efter 'session.gc_maxlifetime' i din php.ini och sätt den till 86400 eller högre."
+msgstr ""
+"Sök efter 'session.gc_maxlifetime' i din php.ini och sätt den till 86400 "
+"eller högre."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Av"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr "För att använda FusionDirectory utan problem, bör session.auto_start i din php.ini sättas till 'Off'."
+msgstr ""
+"För att använda FusionDirectory utan problem, bör session.auto_start i din "
+"php.ini sättas till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr "Sök efter 'session.auto_start' i din php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr "FusionDirectory behöver åtminstone 128MB minne. En inställning under denna gräns kan orsaka fel som inte är reproducerbara. Öka värdet för större installationer."
+msgstr ""
+"FusionDirectory behöver åtminstone 128MB minne. En inställning under denna "
+"gräns kan orsaka fel som inte är reproducerbara. Öka värdet för större "
+"installationer."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr "Sök efter 'memory_limit' i din php.ini och ställ in den på '128M' eller högre."
+msgstr ""
+"Sök efter 'memory_limit' i din php.ini och ställ in den på '128M' eller "
+"högre."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Den här inställningen påverkar PHPs utdata-hantering. Stäng av den för att öka prestanda."
+msgstr ""
+"Den här inställningen påverkar PHPs utdata-hantering. Stäng av den för att "
+"öka prestanda."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Sök efter 'implicit_flush' i din php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Exekveringstiden bör vara åtminstone 30 sekunder."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Sök efter 'max_execution_time' i php.ini och sätt den till '30' eller högre."
+msgstr ""
+"Sök efter 'max_execution_time' i php.ini och sätt den till '30' eller högre."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Öka serversäkerheten genom att sätta expose_php till 'off'. PHP kommer i så fall inte sända någon information om servern du kör på."
+msgstr ""
+"Öka serversäkerheten genom att sätta expose_php till 'off'. PHP kommer i så "
+"fall inte sända någon information om servern du kör på."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Sök efter 'expose_php' i din php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr "Öka din serverprestanda genom att sätta magic_quotes_gpc till 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Sök efter 'zend.ze1_compatibility_mode' i php.ini och sätt den till 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Välkommen"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Välkommen till FusionDirectory setup wizard"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Välkomstmeddelandet"
+msgstr ""
+"Sök efter 'zend.ze1_compatibility_mode' i php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrera"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "LDAP-inspektion"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
-msgstr "Analysera nuvarande LDAP-katalog för kompatibilitet med FusionDirectory"
+msgstr ""
+"Analysera nuvarande LDAP-katalog för kompatibilitet med FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspekterar objektklasser i root-objektet"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Kontrollerar rättigheter för LDAP-databas"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Söker efter osynliga användare"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Söker efter superadministratör"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Söker efter användare utanför person-trädet"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Söker efter grupper utanför gruppträdet"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Söker efter osynliga avdelningar"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Söker efter dubbletter av UID-nummer"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "LDAP-fråga misslyckades"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Saknar objektklassen '%s' för FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Vänligen kontrollera din installation."
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr "Kan inte hantera den strukturella objekttypen hos ditt root-objekt. Vänligen lägg till objektklassen '%s' manuellt."
-
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+msgstr ""
+"Kan inte hantera den strukturella objekttypen hos ditt root-objekt. Vänligen"
+" lägg till objektklassen '%s' manuellt."
+
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Varning"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr "Hittade %s användare som inte kommer att vara synlig(a) i FusionDirectory eller som är ofullständig(a)."
+msgstr ""
+"Hittade %s användare som inte kommer att vara synlig(a) i FusionDirectory "
+"eller som är ofullständig(a)."
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Migreringsfel"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Skapa"
-
-#: setup/class_setupStep_Migrate.inc:872
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Användare"
 
-#: setup/class_setupStep_Migrate.inc:875
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupper"
 
-#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr ""
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Det finns inget FusionDirectory-adminkonto i din LDAP-katalog."
 
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Skapa"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Fel"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Flytta användare in i det konfigurerade användarträdet"
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "till"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Följande referenser kommer att uppdateras"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Hittade %s grupper utanför det konfigurerade trädet '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, 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."
+msgstr ""
+"Hittade %s avdelning(ar) som inte kommer att vara synliga i FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Location name"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "Koppling-URI"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS-koppling"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Bas"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Admin DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Adminlösenord"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Nuvarande status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "LDAP-inställningar"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "LDAP-koppling"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr "Den här dialogrutan utför den grundläggande konfigurationen för LDAP-kopplingen till FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonym koppling till server '%s' misslyckades!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Koppling som användare '%s' misslyckades!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Anonym koppling till servern '%s' lyckades."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Skriv in användare och lösenord!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Koppling som användare '%s' till servern '%s' lyckades!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Slutför"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Slutför - skriv konfigurationsfil"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Skriv konfigurationsfil"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "Din konfigurationsfil är just nu läsbar för alla användare. Vänligen uppdatera filrättigheterna!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Konfigurationen är just nu inte läsbar eller så finns den inte."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr "Efter att ha laddat ner och placerat filen under %s, vänligen säkerställ att användaren som webbservern kör med har rättigheter att läsa %s medan andra användare inte ska kunna det."
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Installationsfel"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Slutförd"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Välkommen till FusionDirectory setup wizard"
 
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Nästa"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Välkomstmeddelandet"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Loggning misslyckades: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "Angiven objectType är tom eller ogiltig!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "okonfigurerad"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr "Filterfel"
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr "Filtret är inte komplett!"
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Rättighet"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Rättighetsfel"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr "Ingen tab-deklaration för '%s' hittades i din konfigurationsfil. Kan inte skapa plugin-instans!"
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Skicka"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Upp"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Ner"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Välj alla"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Fel"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr "skapat av"
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "GÃ¥ till root-avdelning"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "GÃ¥ upp en avdelning"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Hem"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Ladda om lista"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Kopiera"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Klistra in"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Klipp ut post"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Kopiera post"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr "Återskapa ögonblicksbilder"
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr "Exportera lista"
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Återskapa ögonblicksbild"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Skapa ögonblicksbild"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Skapa ny ögonblicksbild från det här objektet"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Allvarligt fel"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "i"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr "online"
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr "XML-fel"
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +883,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
@@ -965,7 +899,8 @@ msgstr "Sida"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr "Ingen PDF-export är möjlig: det finns inget FPDF-bibliotek installerat."
+msgstr ""
+"Ingen PDF-export är möjlig: det finns inget FPDF-bibliotek installerat."
 
 #: include/exporter/class_pdfExporter.inc:196
 msgid "PDF"
@@ -980,308 +915,299 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Begärd kanal finns inte! Vänligen kontakta din administratör"
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Rättighet"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Avbryt allt"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Kan inte klistra in"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Användarnamn"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mall"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Mall-namn"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Allvarligt fel: inga klass-locations definierade - vänligen kör '%s' för att åtgärda detta"
+msgstr ""
+"Allvarligt fel: inga klass-locations definierade - vänligen kör '%s' för att"
+" åtgärda detta"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr "Allvarligt fel: kan inte instansiera klassen '%s' - försök köra '%s' för att åtgärda detta"
+msgstr ""
+"Allvarligt fel: kan inte instansiera klassen '%s' - försök köra '%s' för att"
+" åtgärda detta"
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Allvarligt fel"
+
+#: include/functions.inc:475
 #, 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:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Autentiseringsfel"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 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:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr "Kan inte skapa låsinformation i LDAP-trädet. Vänligen kontakta din administratör!"
+msgstr ""
+"Kan inte skapa låsinformation i LDAP-trädet. Vänligen kontakta din "
+"administratör!"
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP-server returnerade %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr "Hittade flera lås för objektet som ska låsas. Detta ska inte hända - rensar upp multipla referenser."
+msgstr ""
+"Hittade flera lås för objektet som ska låsas. Detta ska inte hända - rensar "
+"upp multipla referenser."
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Storleksgränsen på %d poster har överskridits!"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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"
+msgstr ""
+"Sätt ny storleksgräns till %s och visa mig meddelandet om gränsen "
+"fortfarande överskrids"
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "ofullständig"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Fortsätt ändå"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Redigera ändå"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "Poster per sida"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aktivera filter"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZÅÄÖ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr "Filen '%s' kunde inte tas bort. Försök med fusiondirectory-setup --check-directories för att åtgärda rättighetsproblem."
+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:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Kan inte skriva till revisionsfil!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr "Kan inte läsa revisionsfil!"
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' är inte tillgänglig. Använder standard-bas!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
+msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP-varning"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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!"
+msgstr ""
+"Kan inte hämta schemainformation från servern. Ingen schemakontroll är "
+"möjlig!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Klass(er) tillgänglig(a)"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr "Kan inte allokera ett fritt ID:"
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr "okänd idAllocation-metod!"
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool är inte unik!"
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr "inget ID tillgängligt!"
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr "maximalt antal försök överskridet!"
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Kan inte allokera ett fritt ID!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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"
+msgstr ""
+"Kan inte lokalisera filen '%s' - vänligen kör '%s' för att åtgärda detta"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Alla objekt i den här kategorin"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Vänligen fixa ovanstående fel och ladda om sidan."
 
@@ -1290,46 +1216,46 @@ msgstr "Vänligen fixa ovanstående fel och ladda om sidan."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML-fel i fusiondirectory.conf: %s på rad %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "Funktionen för ögonblicksbilder är aktiverad, men värdet '%s' som krävs för funktionen är inte satt."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
-msgstr "Funktionen för ögonblicksbilder är aktiverad, men kompressionsmodulen som krävs saknas. Vänligen installera '%s'."
+"is missing. Please install \"%s\"."
+msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Alla kategorier"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mitt konto"
 
@@ -1352,7 +1278,7 @@ msgstr "Välj att lista objekt som har '%s' aktiverat"
 msgid "Select to search within subtrees"
 msgstr "Välj för att söka i subträd"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Sök i subträd"
 
@@ -1601,8 +1527,7 @@ msgid "Missing %s PHP extension!"
 msgstr "Saknar PHP-tillägget %s !"
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1535,7 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1666,258 +1591,275 @@ msgstr "Det här kontot har inga giltiga %s-tillägg!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-msgstr "Det här kontot har %s-inställningar aktiverade. Du kan avaktivera dem genom att klicka nedan."
+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
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-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!"
+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
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-msgstr "Det här kontot har %s-inställningar avaktiverade. Du kan aktivera dem genom att klicka nedan."
+msgstr ""
+"Det här kontot har %s-inställningar avaktiverade. Du kan aktivera dem genom "
+"att klicka nedan."
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-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!"
+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
+#, 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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Lägg till %s-inställningar"
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Ta bort %s-inställningar"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "januari"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "februari"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "mars"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "april"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "maj"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "juni"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "juli"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "augusti"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "september"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "oktober"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "november"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "december"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "söndag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "måndag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "torsdag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "fredag"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "lördag"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr "Databasoperation misslyckades!"
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "läs"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "lägg till"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modifiera"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "ta bort"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "sök"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autentisering"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s misslyckades!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "LDAP-operation misslyckades!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objekt"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Uppladdning misslyckades!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Uppladdning misslyckades: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfel med infrastrukturtjänsten!"
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfel med infrastrukturtjänsten: %s"
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' används fortfarande."
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Filen '%s' existerar inte!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan inte öppna filen '%s' för läsning!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan inte öppna filen '%s' för skrivning!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr "Värdet för '%s' är för närvarande okonfigurerat eller ogiltigt, vänligen kolla din konfigurationsfil!"
+msgstr ""
+"Värdet för '%s' är för närvarande okonfigurerat eller ogiltigt, vänligen "
+"kolla din konfigurationsfil!"
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan inte ta bort fil '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan inte skapa katalog '%s'!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan inte ta bort katalogen '%s'!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kontrollerar stöd för %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installera och aktivera PHP-modulen %s."
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installera och aktivera modulen %s Pear"
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr "Kan inte initialisera klassen '%s'! Kanske det är ett plugin som saknas i din FusionDirectory-installation?"
+msgstr ""
+"Kan inte initialisera klassen '%s'! Kanske det är ett plugin som saknas i "
+"din FusionDirectory-installation?"
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 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!"
+msgstr ""
+"Den angivna basen är inte giltig och har återställts till det tidigare "
+"värdet!"
 
 #: include/class_SnapshotDialogs.inc:30
 msgid "Creating an object snapshot"
@@ -1956,7 +1898,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1961,87 @@ msgstr "Skicka buggrapport"
 msgid "Toggle information"
 msgstr "Växla informationsläge"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Prestandavarning"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "under operation på '%s' med LDAP-server '%s'"
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "under operation på LDAP-server %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr "Välj önskade poster"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +2049,12 @@ msgstr "Namn"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Beskrivning"
@@ -2119,11 +2065,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2108,8 @@ msgstr "Redigera"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2118,154 @@ msgstr "Redigera"
 msgid "Remove"
 msgstr "Ta bort"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
-msgstr "Inga plugin-definitioner kunde hittas för att initialisera '%s', vänligen kontrollera din konfigurationsfil."
-
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Borttagningsprocess har avbrutits av pluginen '%s': %s"
+msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr "sekunder"
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Visa %s"
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr "Filterfel"
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr "Filtret är inte komplett!"
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Rättighetsfel"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr "INGEN ETIKETT"
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr "Fel under skrivning"
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, 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:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Posten %s finns inte"
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2305,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -2343,7 +2315,7 @@ msgstr "Ladda upp"
 msgid "Download"
 msgstr "Ladda ner"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2366,10 @@ msgstr "Ett flyttal större än %f"
 msgid "A float smaller than %f"
 msgstr "Ett flyttal mindre än %f"
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,14 +2400,19 @@ msgstr "Okänd post '%s'!"
 msgid "All users"
 msgstr "Alla användare"
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aktivera filter"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Katalogen '%s' specificerat som kompileringskatalog är inte tillgänglig!"
+msgstr ""
+"Katalogen '%s' specificerat som kompileringskatalog är inte tillgänglig!"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2470,7 +2430,9 @@ msgstr ""
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Vänligen kör fusiondirectory-setup --check-config för att åtgärda detta."
+msgstr ""
+"FusionDirectory-konfiguration %s/%s är inte läsbar. Vänligen kör "
+"fusiondirectory-setup --check-config för att åtgärda detta."
 
 #: html/index.php:171
 msgid "Smarty error"
@@ -2518,40 +2480,37 @@ msgstr "Ange ditt lösenord!"
 msgid "Please check the username/password combination."
 msgstr "Kontrollera användarnamn/lösenord-kombinationen."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Kontot låst. Kontakta systemadministratören!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Din webbläsare har avaktiverat cookies. Vänligen aktivera cookies och ladda om den här sidan innan du loggar in!"
+msgstr ""
+"Din webbläsare har avaktiverat cookies. Vänligen aktivera cookies och ladda "
+"om den här sidan innan du loggar in!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2595,9 +2554,10 @@ msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
-msgstr "Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
+msgstr ""
+"Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
 
 #: html/main.php:115
 msgid "PHP configuration"
@@ -2607,7 +2567,9 @@ msgstr "PHP-konfiguration"
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr "Allvarligt fel: Register globals är påslaget. FusionDirectory kommer att vägra logga in om inte detta är åtgärdat av en administratör"
+msgstr ""
+"Allvarligt fel: Register globals är påslaget. FusionDirectory kommer att "
+"vägra logga in om inte detta är åtgärdat av en administratör"
 
 #: html/main.php:142
 msgid "Password change"
@@ -2638,7 +2600,9 @@ msgstr "Plugin"
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
-msgstr "Allvarligt fel: Kan inte hitta några plugin-definitioner för pluginen '%s' ('%s' är ingen fil)!"
+msgstr ""
+"Allvarligt fel: Kan inte hitta några plugin-definitioner för pluginen '%s' "
+"('%s' är ingen fil)!"
 
 #: html/main.php:305
 msgid "Configuration Error"
@@ -2649,7 +2613,9 @@ msgstr "Konfigurationsfel"
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr "Allvarligt fel: inte alla POST-variabler överfördes av PHP - informera din administratör!"
+msgstr ""
+"Allvarligt fel: inte alla POST-variabler överfördes av PHP - informera din "
+"administratör!"
 
 #: plugins/generic/welcome/main.inc:25
 #, php-format
@@ -2662,225 +2628,8 @@ msgstr "Välkommen %s!"
 msgid "References"
 msgstr "Referenser"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Redigera användarens POSIX-inställningar"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Hemkatalog"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr "Sökvägen till hemkatalogen för den här användaren"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Skal"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr "Vilket skal ska användas när den här användaren loggar in"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Primär grupp"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr "Primär grupp för den här användaren"
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr "Status på det här unix-kontot"
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Gruppmedlemskap"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Användare måste ändra lösenord vid första inloggning"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr "Fördröjning innan tvingande lösenordsbyte (dagar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr "Användaren kommer att tvingas byta lösenord efter så här många dagar (lämna tomt för att  avaktivera)"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr "Utgångsdatum för lösenord"
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr "Datum efter vilket denna användares lösenord kommer att sluta gälla (lämna tomt för att avaktivera)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Inaktivitet innan avaktivering av användare (dagar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr "Maximalt antal inaktiva dagar efter lösenordets utgång innan användaren är avaktiverad (lämna tomt för att avaktivera funktionen)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Fördröjning för varning innan lösenordsbyte (dagar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr "Användaren kommer att varnas så här många dagar innan lösenordet löper ut (lämna tomt för att avaktivera)"
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "System trust"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Trust-läge"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr "Auktoriseringstyp för dessa hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "avaktiverad"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "full tillgång"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "tillåt dessa hosts tillgång"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Tillåt användaren att endast logga in på denna lista av hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "automatisk"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "har utgått"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "grace-tid aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "lösenord har slutat gälla"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr "lösenord kan inte ändras"
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Timeout under väntan på låsning. Ignorerar lås!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2656,7 @@ 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:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2677,294 @@ msgstr "Lösenordet igen"
 msgid "Same password as above, to avoid errors"
 msgstr "Samma lösenord som ovan, för att undvika fel"
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Användare"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Efternamn"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Förnamn"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Plats"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Län"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adress"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Rumsnummer"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Rumsnummer"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobil"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Hempostadress"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Privat telefon"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Hemtelefonnummer"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Organisationsinformation"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Avdelning"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Avdelningsnummer"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Avdelningsnummer"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Anställningsnummer"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Anställningsnummer"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Anställningstyp"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Manager"
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Postnummer"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "Det nya lösenordet är för kort."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Lösenordet innehåller möjligtvis problematiska Unicode-tecken!"
 
@@ -3295,7 +3060,9 @@ msgstr "Salt för tokens"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr "Bara en säkerhetsåtgärd, du kan skriva vad som helst där, till och med slumpmässiga tecken"
+msgstr ""
+"Bara en säkerhetsåtgärd, du kan skriva vad som helst där, till och med "
+"slumpmässiga tecken"
 
 #: plugins/config/class_recoveryConfig.inc:72
 msgid "Allow the use of alternate addresses"
@@ -3305,10 +3072,12 @@ msgstr "Tillåt användande av alternativa adresser"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr "Användare kommer också att kunna skriva in en av deras alternativa epostadresser för att återställa lösenordet"
+msgstr ""
+"Användare kommer också att kunna skriva in en av deras alternativa "
+"epostadresser för att återställa lösenordet"
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Inloggningsattribut"
 
@@ -3344,7 +3113,10 @@ msgstr "Meddelandekropp (första %s är inläggnings-ID, andra är länken)"
 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 "Meddelandekropp för det första epostmeddelandet, skickat när en användare frågar efter ett nytt lösenord. Använd %s för inläggnings-ID och återställningslänk."
+msgstr ""
+"Meddelandekropp för det första epostmeddelandet, skickat när en användare "
+"frågar efter ett nytt lösenord. Använd %s för inläggnings-ID och "
+"återställningslänk."
 
 #: plugins/config/class_recoveryConfig.inc:99
 #, php-format
@@ -3380,7 +3152,9 @@ msgstr "Meddelandekropp (%s är login)"
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
-msgstr "Meddelandekropp på det andra epostmeddelandet, som skickas för att bekräfta att lösenordet har ändrats. Använd %s för användarens inloggnings-ID."
+msgstr ""
+"Meddelandekropp på det andra epostmeddelandet, som skickas för att bekräfta "
+"att lösenordet har ändrats. Använd %s för användarens inloggnings-ID."
 
 #: plugins/config/class_recoveryConfig.inc:118
 #, php-format
@@ -3389,7 +3163,11 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr "Hej,\n\nDitt lösenord har ändrats.\nDitt användar-ID är fortfarande %s."
+msgstr ""
+"Hej,\n"
+"\n"
+"Ditt lösenord har ändrats.\n"
+"Ditt användar-ID är fortfarande %s."
 
 #: plugins/config/class_configInLdap.inc:56
 #: plugins/config/class_configInLdap.inc:70
@@ -3417,7 +3195,10 @@ msgstr "Språk"
 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 "Applikationens språk. Om inställd på 'automatisk' eller inte tillgänglig, kommer den som efterfrågas av webbläsaren att användas. Detta kan också ställas in per användare. "
+msgstr ""
+"Applikationens språk. Om inställd på 'automatisk' eller inte tillgänglig, "
+"kommer den som efterfrågas av webbläsaren att användas. Detta kan också "
+"ställas in per användare. "
 
 #: plugins/config/class_configInLdap.inc:96
 msgid "Theme"
@@ -3436,526 +3217,476 @@ msgid "Timezone to be used"
 msgstr "Tidszon som ska användas"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Schema-inställningar"
+msgid "Core settings"
+msgstr "Bas-inställningar"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "LDAP storleksgräns"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr "Definierar antalet poster att få från LDAP som standard."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Redigera låsning"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Kontrollera om en post som just blir redigerad har blivit modifierad utanför"
+" FusionDirectory under tiden."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Aktivera loggning"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Event-loggning på FusionDirectorys sida."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Aktivera schema-kontroll under inloggning."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Aktivera ögonblicksbilder"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Detta aktiverar möjligheten att spara vissa posters tillstånd och återskapa "
+"dem senare."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Bas för ögonblicksbilder"
+
+#: plugins/config/class_configInLdap.inc:141
+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
 msgid "Password settings"
 msgstr "Lösenordsinställningar"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Lösenordens standard-hash"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Standard-hash som ska användas"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Tvinga standard hash"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 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:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Lösenordets minsta längd"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Minsta längd på lösenord"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Lösenord minsta avvikelse"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 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:143
-msgid "Use account expiration"
-msgstr "Använd datum för kontots upphörande"
-
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
-msgstr "Aktiverar skugg-attribut-test under inloggning till FusionDirectory och tvingar förnyelse av lösenord eller kontolåsning"
-
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
-msgstr "SASL Realm"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr "SASL Exop"
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr "Attribut att lagra i userPassword-attributet"
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Bas-inställningar"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Visa sammanfattning i listningar"
-
-#: plugins/config/class_configInLdap.inc:162
-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 "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:167
-msgid "Edit locking"
-msgstr "Redigera låsning"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr "Kontrollera om en post som just blir redigerad har blivit modifierad utanför FusionDirectory under tiden."
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
+msgstr "Använd datum för kontots upphörande"
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Aktivera loggning"
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+"Aktiverar skugg-attribut-test under inloggning till FusionDirectory och "
+"tvingar förnyelse av lösenord eller kontolåsning"
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Event-loggning på FusionDirectorys sida."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
+msgstr "SASL Realm"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "LDAP storleksgräns"
+msgid "SASL Exop"
+msgstr "SASL Exop"
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Definierar antalet poster att få från LDAP som standard."
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr "Attribut att lagra i userPassword-attributet"
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Inloggning och session"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
-msgstr "Vilket LDAP-attribut ska användas som inloggningnamn under inloggning."
+msgstr ""
+"Vilket LDAP-attribut ska användas som inloggningnamn under inloggning."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Tvinga krypterade anslutningar"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr "Aktiverar PHPs säkerhetskontroller för att tvinga krypterad access (https) till webbgränssnittet."
+msgstr ""
+"Aktiverar PHPs säkerhetskontroller för att tvinga krypterad access (https) "
+"till webbgränssnittet."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Varna om session inte är krypterad"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 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:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Sessioners livslängd"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Aktivera ögonblicksbilder"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Detta aktiverar möjligheten att spara vissa posters tillstånd och återskapa dem senare."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Bas för ögonblicksbilder"
-
-#: plugins/config/class_configInLdap.inc:237
-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:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Lagring för personer och grupper"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Personer DN-attribut"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 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:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Strikt namnpolicy"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Nästa id-hook"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Var man ska börja kolla efter nya fria användar-IDn."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Var man ska börja kolla efter nya fria grupp-IDn."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Användares RDN"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Gruppers RDN"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Grenen där grupper lagras."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Id-allokeringsmetod"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Traditionell"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Visa fel"
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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 "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."
+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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximal tid för LDAP-frågor"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr "Stoppa LDAP-förfrågningar om det inte kommer något svar inom den specificerade mängden sekunder."
+msgstr ""
+"Stoppa LDAP-förfrågningar om det inte kommer något svar inom den "
+"specificerade mängden sekunder."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Logga LDAP-statistik"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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 "Spåra LDAP-timingstatistik till syslog. Detta kan hjälpa till att hitta indexeringsproblem eller dåliga sökfilter."
+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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug-nivå"
 
-#: plugins/config/class_configInLdap.inc:403
+#: 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:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: plugins/config/class_configInLdap.inc:420
-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:362
+msgid "Display summary in listings"
+msgstr "Visa sammanfattning i listningar"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "flik"
+#: 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 ""
+"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:424
-msgid "The tab that this hook concerns"
-msgstr "Fliken som denna hook härrör till"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "läge"
+#: 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:429
-msgid "When to call this command"
-msgstr "När detta kommando ska anropas"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
-msgstr "Kommando som ska anropas"
+#: 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:442
-msgid "Hooks"
-msgstr "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Tillgängliga skal"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Tillgängliga POSIX-skal för FD-användare"
+#: 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:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
+#: 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:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
+msgstr "När detta kommando ska anropas"
+
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr "Kommando som ska anropas"
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3785,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3914,22 @@ msgstr "Hantera användare"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr "Kontolåsning"
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr "LÃ¥s upp konto"
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr "LÃ¥s konto"
 
@@ -4245,7 +3975,7 @@ msgstr "Ta bort användare"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3995,7 @@ msgid "Information"
 msgstr "Information"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +4019,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Redigera posix-egenskaper"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Visa primära grupper"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Visa primära grupper"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Visa mail-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Visa samba-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objektgrupp"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupp"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Medlemsobjekt"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "System trust"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Grupplista"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Trust-läge"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Auktoriseringstyp för dessa hosts"
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "avaktiverad"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "full tillgång"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Tvinga GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "tillåt dessa hosts tillgång"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Gruppmedlemmar"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Grupplista"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4217,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4677,7 +4394,9 @@ msgstr "Skapa ett nytt administrationskonto för FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Den här dialogrutan kommer att lägga till en ny superadministratör till ditt LDAP-träd"
+msgstr ""
+"Den här dialogrutan kommer att lägga till en ny superadministratör till ditt"
+" LDAP-träd"
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4692,7 +4411,10 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr "Det verkar vara första gången du startar FusionDirectory - vi hittade ingen konfiguration just nu. Den här enkla wizarden ska hjälpa dig att ställa in programvaran.  "
+msgstr ""
+"Det verkar vara första gången du startar FusionDirectory - vi hittade ingen "
+"konfiguration just nu. Den här enkla wizarden ska hjälpa dig att ställa in "
+"programvaran.  "
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -4708,7 +4430,9 @@ msgstr "Försöka identifiera problem med din PHP- och LDAP-installation"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr "Låta dig välja från ett urval av grundläggande och avancerade konfigurationsinställningar"
+msgstr ""
+"Låta dig välja från ett urval av grundläggande och avancerade "
+"konfigurationsinställningar"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -4724,7 +4448,9 @@ msgstr "Hitta varje tänkbart konfigurationsfel"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr "Migrera varje tänkbar LDAP-installation - skapa backuper för säkerhets skull!"
+msgstr ""
+"Migrera varje tänkbar LDAP-installation - skapa backuper för säkerhets "
+"skull!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue:"
@@ -4745,13 +4471,11 @@ msgstr "Klicka på 'Nästa'-knappen när du är klar."
 msgid "Add required object classes to the LDAP base"
 msgstr "Lägg till de objektklasser som krävs till LDAP-basen"
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Nuvarande"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Efter migrering"
 
@@ -4759,51 +4483,57 @@ msgstr "Efter migrering"
 msgid "Close"
 msgstr "Stäng"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+"Under LDAP-inspektionen kommer vi att undersöka flera vanliga fallgropar som"
+" man kan ramla i när man migrerar till FusionDirectory LDAP-administration. "
+"Det är möjligt att du behöver åtgärda problemen nedan för att kunna "
+"tillhandahålla stabila tjänster."
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Kontrollera igen"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Om du vill vet vad som kommer att göras när valda poster migreras, använd 'Visa ändringar'-knappen för att se LDIF-filen."
+msgstr ""
+"Om du vill vet vad som kommer att göras när valda poster migreras, använd "
+"'Visa ändringar'-knappen för att se LDIF-filen."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Visa ändringar"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 "Under LDAP-inspektionen kommer vi att undersöka flera vanliga fallgropar som man kan ramla i när man migrerar till FusionDirectory LDAP-administration. Det är möjligt att du behöver åtgärda problemen nedan för att kunna tillhandahålla stabila tjänster."
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Kontrollera igen"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Skapa konfigurationsfil"
@@ -4842,7 +4572,10 @@ msgstr ""
 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 "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."
+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
@@ -4879,7 +4612,8 @@ msgstr "Ditt lösenord har nu bytts."
 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"
+msgstr ""
+"Skriv in din nuvarande epostadress i fältet nedan och tryck på 'Byt'-knappen"
 
 #: ihtml/themes/breezy/recovery.tpl.c:62
 msgid ""
@@ -4895,7 +4629,9 @@ msgstr ""
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr "Återskapande av lösenord är inte aktiverat. Om du har förlorat ditt lösenord, kontakta din administratör"
+msgstr ""
+"Återskapande av lösenord är inte aktiverat. Om du har förlorat ditt "
+"lösenord, kontakta din administratör"
 
 #: ihtml/themes/breezy/login.tpl.c:2
 msgid "Login screen"
@@ -4905,7 +4641,9 @@ msgstr "Inloggningsskärm"
 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."
+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
@@ -4938,13 +4676,16 @@ msgstr ""
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignorera det här felet och visa alla poster som LDAP-servern returnerar"
+msgstr ""
+"ignorera det här felet och visa alla poster som LDAP-servern returnerar"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "ignorera det här felet och visa alla poster som passar inom den definierade sizelimit och låt mig använda filter istället"
+msgstr ""
+"ignorera det här felet och visa alla poster som passar inom den definierade "
+"sizelimit och låt mig använda filter istället"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4959,12 +4700,16 @@ msgstr ""
 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."
+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
 #: ihtml/themes/breezy/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."
+msgstr ""
+"Så - om du är säker - tryck 'Ta bort' för att fortsätta och 'Avbryt' för att"
+" avbryta."
 
 #: ihtml/themes/breezy/framework.tpl.c:2
 msgid "Main"
@@ -5035,17 +4780,24 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr "Vissa värden måste vara unika inom katalogtjänsten medan vissa kombinationer inte är gångbara. FusionDirectory visar de relevanta attributen. Vänligen behåll värdena nedan för att uppfylla systemets policy."
+msgstr ""
+"Vissa värden måste vara unika inom katalogtjänsten medan vissa kombinationer"
+" inte är gångbara. FusionDirectory visar de relevanta attributen. Vänligen "
+"behåll värdena nedan för att uppfylla systemets policy."
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Kom ihåg att vissa egenskaper som tagna ögonblicksbilder inte kommer att kopieras!"
+msgstr ""
+"Kom ihåg att vissa egenskaper som tagna ögonblicksbilder inte kommer att "
+"kopieras!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr "Eller om du kopierar och klipper en post inom FusionDirectory och tar bort källobjektet, kan du få fel när du klistrar in det här objektet igen!"
+msgstr ""
+"Eller om du kopierar och klipper en post inom FusionDirectory och tar bort "
+"källobjektet, kan du få fel när du klistrar in det här objektet igen!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5153,7 +4905,9 @@ msgstr "Din lösenordsmetod kommer inte att ändras!"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Du har ändrat ditt lösenord. Kom ihåg att ändra alla program som är inställda på att använda det också."
+msgstr ""
+"Du har ändrat ditt lösenord. Kom ihåg att ändra alla program som är "
+"inställda på att använda det också."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index fc5d304998dbfdfa29d39d490fd3e61e9544d093..1340e87d3fb120e9eaab597128285f5d25aa595c 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -1,943 +1,829 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr ""
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr ""
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +835,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +866,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr ""
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr ""
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
-"You have installed the mixed groups plugin, but your schema configuration "
-"does not support this."
-msgstr ""
-
-#: include/functions.inc:2637
-msgid ""
-"In order to use mixed groups the objectClass \"posixGroup\" must be "
-"AUXILIARY"
-msgstr ""
-
-#: include/functions.inc:2640
-msgid ""
-"Your schema is configured to support mixed groups, but this plugin is not "
-"present."
-msgstr ""
-
-#: include/functions.inc:2641
-msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
-msgstr ""
-
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
+"You have installed the mixed groups plugin, but your schema configuration "
+"does not support this."
 msgstr ""
 
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
+#: include/functions.inc:2104
+msgid ""
+"In order to use mixed groups the objectClass \"posixGroup\" must be "
+"AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
+#: include/functions.inc:2107
+msgid ""
+"Your schema is configured to support mixed groups, but this plugin is not "
+"present."
 msgstr ""
 
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
+#: include/functions.inc:2108
+msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1152,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1352,7 +1214,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1463,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1471,7 @@ msgid "Cancel"
 msgstr ""
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
@@ -1682,239 +1543,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1820,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1883,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,11 +1987,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2030,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2040,154 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr ""
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2227,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2237,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2288,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr ""
@@ -2445,11 +2322,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
@@ -2518,36 +2399,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2471,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2538,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2566,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2587,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2983,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3413,549 +3088,482 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
-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."
+#: plugins/config/class_configInLdap.inc:91
+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 ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3662,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3791,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3852,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3872,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,163 +3896,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4496,10 +4094,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4339,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4351,51 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index dddda835d0b88e0c8ce3e2288af0d8b388f2d1b7..5e473c07a02dc7864f389defdfae7d2543842418 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -1,943 +1,859 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Cài đặt ngôn ngữ"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Bước này cho phép bạn lựa chọn ngôn ngữ bạn muốn dùng."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr "Tá»± Ä‘á»™ng"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Tên vị trí"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Kết nối TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Cơ sở"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Thẩm định quyền"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Admin DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Mật khẩu Admin"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Trạng thái"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Tình trạng hiện tại"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Cài đặt LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Thiết lập kết nối LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Kết nối nặc danh với server '%s' thất bại!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Kết nối với vai trò người dùng '%s' thất bại!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Kết nối nặc danh đến server '%s' thành công."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Xin hãy xác định người dùng và mật khẩu!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Kết nối với tư cách người dùng '%s' đến server '%s' thành công!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Lỗi cài đặt"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Đã hoàn thành"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Tiếp tục"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Chào mừng"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Kết thúc"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Kết thúc - viết file cấu hình"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Viết file cấu hình"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"File cấu hình của bạn hiện cả thế giới đều đọc được. Xin hãy cập nhật quyền "
+"truy cập file!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Cấu hình hiện tại không thể đọc được hoặc nó không tồn tại."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Kiểm tra các module và mở rộng của PHP"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Kiểm tra cài đặt"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Kiểm tra cơ bản cho khả năng tương thích và mở rộng PHP "
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Kiểm tra phiên bản PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP phải là phiên bản %s hoặc như trên."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Xin hãy cập nhật cho một phiên bản hỗ trợ."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr "đăng ký_toàn cầu (register_globals) là một cơ chế PHP dùng để đăng ký tất cả các biến số toàn cầu mà có thể truy cập từ các tập lệnh mà không phải thay đổi phạm vi. Đây có thể là một rủi ro về bảo mật."
+msgstr ""
+"đăng ký_toàn cầu (register_globals) là một cơ chế PHP dùng để đăng ký tất cả"
+" các biến số toàn cầu mà có thể truy cập từ các tập lệnh mà không phải thay "
+"đổi phạm vi. Đây có thể là một rủi ro về bảo mật."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr "Tìm kiếm 'register_globals' trong thư mục php.ini của bạn và chuyển nó thành 'Off'."
+msgstr ""
+"Tìm kiếm 'register_globals' trong thư mục php.ini của bạn và chuyển nó thành"
+" 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr "PHP sử dụng giá trị này để phần mềm thu dọn rác có thể sóa các phiên cũ đi."
+msgstr ""
+"PHP sử dụng giá trị này để phần mềm thu dọn rác có thể sóa các phiên cũ đi."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr "Thiết lập giá trị này đến một ngày sẽ ngăn cản việc mất đi các phiên và cookies trước khi chúng thực sự hết hạn."
+msgstr ""
+"Thiết lập giá trị này đến một ngày sẽ ngăn cản việc mất đi các phiên và "
+"cookies trước khi chúng thực sự hết hạn."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr "Tìm kiếm  'session.gc_maxlifetime' trong thư mục php.ini của bạn và thiết lập nó đển 86400 hoặc cao hơn."
+msgstr ""
+"Tìm kiếm  'session.gc_maxlifetime' trong thư mục php.ini của bạn và thiết "
+"lập nó đển 86400 hoặc cao hơn."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Tắt"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr "Tìm kiếm  'session.auto_start' trong thư mục php.ini của bạn và đặt nó thành 'Off'."
+msgstr ""
+"Tìm kiếm  'session.auto_start' trong thư mục php.ini của bạn và đặt nó thành"
+" 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr "Lựa chọn này sẽ ảnh hưởng tới việc sử lý đầu vào PHP. Tắt chức năng này đi, để tăng khả năng hoạt động."
+msgstr ""
+"Lựa chọn này sẽ ảnh hưởng tới việc sử lý đầu vào PHP. Tắt chức năng này đi, "
+"để tăng khả năng hoạt động."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr "Tìm kiếm 'implicit_flush' trong thư mục php.ini của bạn và chuyển nó sang 'Off'."
+msgstr ""
+"Tìm kiếm 'implicit_flush' trong thư mục php.ini của bạn và chuyển nó sang "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Thời gian chạy ít nhất là 30 giây."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
-msgstr "Tìm kiếm 'max_execution_time' trong thư mục php.ini của bạn và thiết lập nó đến '30' hoặc cao hơn."
+msgstr ""
+"Tìm kiếm 'max_execution_time' trong thư mục php.ini của bạn và thiết lập nó "
+"đến '30' hoặc cao hơn."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr "Tăng tính bảo mật của server bằng việc thiết lập expose_php thành 'off'. PHP sẽ không gửi bất cứ thông tin nào về server bạn đang chạy trong trường hợp này."
+msgstr ""
+"Tăng tính bảo mật của server bằng việc thiết lập expose_php thành 'off'. PHP"
+" sẽ không gửi bất cứ thông tin nào về server bạn đang chạy trong trường hợp "
+"này."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr "Tìm kiếm 'expose_php' trong thư much php.ini của bạn và chuyển nó thành 'Off'."
+msgstr ""
+"Tìm kiếm 'expose_php' trong thư much php.ini của bạn và chuyển nó thành "
+"'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr "Tăng cường khả năng hoạt động cho server của bạn bằng việc thiết lập magic_quotes_gpc thành 'off'."
+msgstr ""
+"Tăng cường khả năng hoạt động cho server của bạn bằng việc thiết lập "
+"magic_quotes_gpc thành 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
-msgstr "Tìm kiếm 'zend.ze1_compatibility_mode' trong thư mục  php.ini và chuyển nó thành 'Off'."
-
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Chào mừng"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
+"Tìm kiếm 'zend.ze1_compatibility_mode' trong thư mục  php.ini và chuyển nó "
+"thành 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Tin nhắn chào mừng"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Di trú"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Thanh tra LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Kiểm tra những người dùng ẩn"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Kiểm tra siêu admin"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Kiểm tra người dùng bên ngoài cây con người"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Kiểm tra nhóm bên ngoài cây nhóm"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Kiểm tra các bộ phận ẩn"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Kiểm tra các số ID cuả người dùng (UID) được nhân bản"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr "Yêu cầu LDAP thất bại"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "Thất bại"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Cảnh báo"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Lỗi di trú"
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Người dùng"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Các nhóm"
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Tạo "
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Người dùng"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr "Các nhóm"
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "Lá»—i"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 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_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "đến"
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Tham chiếu sau sẽ được cập nhật"
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, 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_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Tên vị trí"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Kết nối TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Cơ sở"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Thẩm định quyền"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Admin DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Mật khẩu Admin"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "Trạng thái"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Tình trạng hiện tại"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Cài đặt LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Thiết lập kết nối LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Kết nối nặc danh với server '%s' thất bại!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Kết nối với vai trò người dùng '%s' thất bại!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Kết nối nặc danh đến server '%s' thành công."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Xin hãy xác định người dùng và mật khẩu!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Kết nối với tư cách người dùng '%s' đến server '%s' thành công!"
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Kết thúc"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Kết thúc - viết file cấu hình"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Viết file cấu hình"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr "File cấu hình của bạn hiện cả thế giới đều đọc được. Xin hãy cập nhật quyền truy cập file!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Cấu hình hiện tại không thể đọc được hoặc nó không tồn tại."
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr "Lỗi cài đặt"
-
-#: setup/class_setup.inc:205
-msgid "Completed"
-msgstr "Đã hoàn thành"
-
-#: setup/class_setup.inc:248
-msgid "Next"
-msgstr "Tiếp tục"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Tin nhắn chào mừng"
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Đăng nhập thất bại: %s"
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr "ObjecType được chỉ định đang rỗng hặc không hợp lệ!"
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "không được cấu hình"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "Cho phép"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr "Lỗi về cấp phép"
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, 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/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, 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/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "Ná»™p"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "Lên"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "Xuống"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr "Chọn tất"
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "Lá»—i"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "Đi đến bộ phận gốc"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Các thao tác"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr "Cut"
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr "Lỗi nặng"
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr ""
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +865,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
@@ -980,308 +896,297 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "Cho phép"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Hủy bỏ tất"
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Không thể paste"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mẫu"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "Tên Mẫu"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr "Lỗi nghiêm trọng: không có vị trí lớp nào được xác định - xin hãy chạy '%s' để sửa lỗi này"
+msgstr ""
+"Lỗi nghiêm trọng: không có vị trí lớp nào được xác định - xin hãy chạy '%s' "
+"để sửa lỗi này"
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-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"
+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:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr "Lỗi nặng"
+
+#: include/functions.inc:475
 #, 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'."
+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:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Lỗi xác định thẩm quyền"
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 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:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-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!"
+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:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-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."
+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:1121
+#: include/functions.inc:875
 #, 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:1123
+#: include/functions.inc:877
 #, 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"
+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:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "chưa hoàn thành"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, 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:1778
-msgid "Entries per page"
-msgstr "các entry cho mỗi trang"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Áp dụng bộ lọc"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 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 đồ!"
+msgstr ""
+"Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr "Không thể phân phối một ID miễn phí!"
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, 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!"
+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:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Tất cả các đối tượng trong hạng mục này"
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 
@@ -1290,46 +1195,46 @@ msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 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:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 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:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
-msgstr "Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa được thiết lập."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
+msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Tất cả các mục"
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
@@ -1352,7 +1257,7 @@ msgstr "Chọn để liệt kê đối tượng mà cho phép '%s'"
 msgid "Select to search within subtrees"
 msgstr "Chọn để tìm kiếm trong các cây con"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Tìm kiếm tại các cây con"
 
@@ -1601,8 +1506,7 @@ 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
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1514,7 @@ msgid "Cancel"
 msgstr "Hủy bỏ"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Áp dụng"
@@ -1666,255 +1570,266 @@ msgstr "Tài khoản này không có chức năng mở rộng %s hợp lệ!"
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
-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."
+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
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
-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!"
+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
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
-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."
+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:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-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!"
+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
+#, 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:635
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Thêm thiết lập %s "
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Xóa thiết lập %s"
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Tháng Một"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Tháng Hai"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Tháng Ba"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Tháng Tư"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Tháng Năm"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Tháng Sáu"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Tháng Bảy"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Tháng Tám"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Tháng Chín"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Tháng Mười"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Tháng Mười Hai"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "Đọc thao tác"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "thêm tao tác"
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "thay đối thao tác"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "xóa thao tác"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "tìm kiếm thao tác"
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "Xác định thẩm quyền"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s thất bại!"
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Hoạt động LDAP thất bại!"
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "đối tượng"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Tải lên thất bại!"
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Tải lên thất bại: %s"
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 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:745
+#: include/class_msgPool.inc:723
 #, 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:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, 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:764
+#: include/class_msgPool.inc:742
 #, 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:766
+#: include/class_msgPool.inc:744
 #, 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:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "File '%s' không tồn tại!"
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Không thể mở file '%s' để đọc!"
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Không thể mở file '%s' để viết!"
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Không thế xóa file '%s'!"
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Không thể xóa folder '%s'!"
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kiểm tra hỗ trợ %s"
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, 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:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1871,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1934,88 @@ msgstr "Gửi thông báo lỗi"
 msgid "Toggle information"
 msgstr "Thông tin Toggle"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr "Cảnh báo khả năng hoạt động"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, 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!"
+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:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, 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:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Trong khi chạy trên LDAP server %s"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +2023,12 @@ msgstr "Tên"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Mô tả"
@@ -2119,11 +2039,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2082,8 @@ msgstr "Hiệu chỉnh"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2092,154 @@ msgstr "Hiệu chỉnh"
 msgid "Remove"
 msgstr "Xóa bỏ"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "Qúa trình xóa đã bị hủy bỏ bởi plugin '%s': %s"
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr "Lỗi về cấp phép"
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, 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:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, 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/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2279,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2343,7 +2289,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2340,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,14 +2374,19 @@ msgstr "Entry '%s' không được biết đến!"
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Áp dụng bộ lọc"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr "Không thể truy cập vào thư mục '%s' được xác định là thư mục soạn thảo!"
+msgstr ""
+"Không thể truy cập vào thư mục '%s' được xác định là thư mục soạn thảo!"
 
 #: html/index.php:56 html/class_passwordRecovery.inc:173
 #, php-format
@@ -2518,40 +2452,38 @@ 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:334
+#: html/index.php:337
 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!"
+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:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr "Trình duyệt của bạn đã vô hiệu cookies. Xin hãy cho phép cookies vào và tải lại trang này trước khi đăng nhập!"
+msgstr ""
+"Trình duyệt của bạn đã vô hiệu cookies. Xin hãy cho phép cookies vào và tải "
+"lại trang này trước khi đăng nhập!"
 
 #: html/class_passwordRecovery.inc:117
 #, php-format
@@ -2595,7 +2527,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2594,8 @@ msgstr "Chào mừng %s!"
 msgid "References"
 msgstr "Các tham chiếu"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr "Hiệu chỉnh cài đặt POSIX của người dùng"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "Thư mục chủ"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "Nhóm sơ cấp"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "Tư cách thành viên nhóm"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "Tài khoản"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "Người dùng phải thay đổi mật khẩu ngay lần đăng nhập đầu tiên"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "Ủy thác hệ thống"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "Chế độ ủy thác"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "Đã vô hiệu"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "Truy cập hoàn toàn"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "Cho phép truy cập đến các máy chủ này"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "tá»± Ä‘á»™ng"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "hết hạn"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "Thời gian trước khi tài khoản bị khóa đang hoạt động"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "hoạt động"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr "mật khẩu hết hạn"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "Số ID của người sử dụng"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "Số ID của nhóm"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Thời gian chờ khóa. Bỏ qua khóa!"
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2622,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2643,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "Người dùng"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Họ"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Tên"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Vị trí"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Bang"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Số điện thoại"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Số fax"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Số điện thoại riêng"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Bộ phận"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Số phòng ban"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Mã bưu điện"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 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:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 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:663
-msgid "The password used as new is to short."
-msgstr "Mật khẩu mới cần được cắt ngắn lại."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +3039,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr "Thuộc tính đăng nhập"
 
@@ -3436,526 +3167,459 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Bật chức năng snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Gốc snapshot"
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Thiết lập mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Độ dài tối thiểu của mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Sử dụng việc hết hạn tài khoản"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Hiển thị tóm tắt trên danh sách"
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Đăng nhập và phiên"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Thực thi việc mã hóa các kết nối"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 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:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Thời gian cho một phiên (một Session)"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Bật chức năng snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Gốc snapshot"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Kho lưu trữ người và nhóm"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Thuộc tính DN người"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Sá»­a lá»—i"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: 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:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Đăng nhập thống kê LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Cấp độ sửa lỗi"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: 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: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:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: 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:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: 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:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
+msgstr ""
+
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3718,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3847,22 @@ msgstr "Quản lý người dùng"
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3908,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3928,7 @@ msgid "Information"
 msgstr "Thông tin"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +3952,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Nhóm đối tượng"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Nhóm "
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Các đối tượng thành viên"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Ủy thác hệ thống"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Danh sách các nhóm"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Chế độ ủy thác"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "Đã vô hiệu"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Truy cập hoàn toàn"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "Áp dụng GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+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_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "Các thành viên nhóm"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Danh sách các nhóm"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4150,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4677,7 +4327,8 @@ msgstr ""
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr "Hộp thoại này sẽ tự động thêm một siêu admin mới vào cây LDAP của bạn."
+msgstr ""
+"Hộp thoại này sẽ tự động thêm một siêu admin mới vào cây LDAP của bạn."
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
@@ -4708,7 +4359,8 @@ msgstr "Cố gắng tìm ra vấn đề trong cài đặt PHP và LDAP của b
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr "Cho phép bạn lựa chọn từ một loạt các phím chuyển cấu hình cơ bản và cao cấp"
+msgstr ""
+"Cho phép bạn lựa chọn từ một loạt các phím chuyển cấu hình cơ bản và cao cấp"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -4745,13 +4397,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr "Hiện tại"
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr "Sau khi di trú"
 
@@ -4759,51 +4409,53 @@ msgstr "Sau khi di trú"
 msgid "Close"
 msgstr "Đóng"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr "Kiểm tra lại"
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr "Nếu bạn muốn biết việc gì sẽ được tiến hành khi di trú các entry được chọn này, hãy sử dụng phím 'hiển thị thay đổi 'để xem định dạng LDIF."
+msgstr ""
+"Nếu bạn muốn biết việc gì sẽ được tiến hành khi di trú các entry được chọn "
+"này, hãy sử dụng phím 'hiển thị thay đổi 'để xem định dạng LDIF."
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr "Hiển thị các thay đổi"
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr "Kiểm tra lại"
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr "Tạo ra file cấu hình của bạn"
@@ -4905,7 +4557,9 @@ msgstr "Màn hình đăng nhập"
 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ị."
+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
@@ -4930,7 +4584,12 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "Lựa chọn giới hạn kích cỡ khiến cho hoạt động của LDAP nhanh hơn và giúp cho LDAP server không chịu quá nhiều tải. Cách đơn giản nhất để quản lý được các cơ sở dữ liệu lớn mà không có thời gian hạn định dài là hạn chế việc tìm kiếm của bạn vào các giá trị nhỏ hơn và sử dụng bộ lọc để có được các entry mà bạn đang tìm kiếm."
+msgstr ""
+"Lựa chọn giới hạn kích cỡ khiến cho hoạt động của LDAP nhanh hơn và giúp cho"
+" LDAP server không chịu quá nhiều tải. Cách đơn giản nhất để quản lý được "
+"các cơ sở dữ liệu lớn mà không có thời gian hạn định dài là hạn chế việc tìm"
+" kiếm của bạn vào các giá trị nhỏ hơn và sử dụng bộ lọc để có được các entry"
+" mà bạn đang tìm kiếm."
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -4944,7 +4603,9 @@ msgstr "Lờ đi lỗi này và hiển thị tất cả các entry mà LDAP serv
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr "Lờ lỗi này đi và hiển thị tất cả các entry mà phù hợp với giới hạn kích cỡ đã xác định và thay vào đó cho tôi sử dụng các bộ lọc "
+msgstr ""
+"Lờ lỗi này đi và hiển thị tất cả các entry mà phù hợp với giới hạn kích cỡ "
+"đã xác định và thay vào đó cho tôi sử dụng các bộ lọc "
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:14
 msgid "Set"
@@ -4964,7 +4625,9 @@ msgstr ""
 #: ihtml/themes/breezy/simple-remove.tpl.c:8
 #: ihtml/themes/breezy/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."
+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/framework.tpl.c:2
 msgid "Main"
@@ -5039,7 +4702,8 @@ msgstr ""
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr "Hãy nhớ rằng một số đặc tính ví dụ như snapshot sẽ không được copy lại!"
+msgstr ""
+"Hãy nhớ rằng một số đặc tính ví dụ như snapshot sẽ không được copy lại!"
 
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:11
 msgid ""
@@ -5153,7 +4817,9 @@ msgstr ""
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr "Bạn đã thay đổi mật khẩu thành công. Hãy nhớ thay đổi cả các chương trình cấu hình để sử dụng được nó."
+msgstr ""
+"Bạn đã thay đổi mật khẩu thành công. Hãy nhớ thay đổi cả các chương trình "
+"cấu hình để sử dụng được nó."
 
 #: plugins/addons/dashboard/groups_stats.tpl.c:2
 msgid "There is 1 group:"
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 0fa5719dd31b3feca48433ff5e1718542251db2a..a6f69eba4f2122ce80da6c7535e0b527b8611a9e 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -1,943 +1,830 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-29 21:46+0200\n"
-"PO-Revision-Date: 2017-03-26 15:51+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
+"POT-Creation-Date: 2017-04-30 15:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:385
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:456
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "位置名称"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "位置"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "管理员 DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "管理员口令"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "状态"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "重试"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "刷新"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: 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 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "警告"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "完成"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:486
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "好"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:981
-#: setup/class_setupStep_Migrate.inc:1057
-#: setup/class_setupStep_Migrate.inc:1180
-#: setup/class_setupStep_Migrate.inc:1273
-#: setup/class_setupStep_Migrate.inc:1352
-#: setup/class_setupStep_Migrate.inc:1396
+#: 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
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:490
-#: setup/class_setupStep_Migrate.inc:567 setup/class_setupStep_Migrate.inc:705
-#: setup/class_setupStep_Migrate.inc:982
-#: setup/class_setupStep_Migrate.inc:1058
-#: setup/class_setupStep_Migrate.inc:1181
-#: setup/class_setupStep_Migrate.inc:1274
-#: setup/class_setupStep_Migrate.inc:1353
-#: setup/class_setupStep_Migrate.inc:1397
+#: 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
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:370
-#: setup/class_setupStep_Migrate.inc:421 setup/class_setupStep_Migrate.inc:501
-#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:865
-#: setup/class_setupStep_Migrate.inc:880
+#: 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
 msgid "Failed"
 msgstr "失败"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:1131
-#: include/password-methods/class_password-methods.inc:180
-#: include/functions.inc:522 include/functions.inc:679
-#: include/functions.inc:726 include/functions.inc:834
-#: include/functions.inc:3001 include/functions.inc:3178
-#: include/class_config.inc:322 include/class_ldap.inc:924
-#: include/class_ldap.inc:1284 include/simpleplugin/class_simplePlugin.inc:593
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
 #: include/simpleplugin/attributes/class_SetAttribute.inc:726
-#: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:278
-#: include/class_SnapshotHandler.inc:311 include/class_SnapshotHandler.inc:327
-#: include/class_SnapshotHandler.inc:460 include/class_SnapshotHandler.inc:463
-#: html/index.php:371
+#: 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/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: setup/class_setupStep_Migrate.inc:502
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:574
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1203
-#: setup/class_setupStep_Migrate.inc:1314
-#: setup/class_setupStep_Migrate.inc:1378
-#: setup/class_setupStep_Migrate.inc:1422 setup/class_setupStep_Ldap.inc:198
-#: include/class_xml.inc:55 include/functions.inc:850
-#: include/functions.inc:2535 include/simpleplugin/class_simpleTabs.inc:322
-#: html/index.php:597 html/main.php:158
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "警告"
-
-#: setup/class_setupStep_Migrate.inc:576
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:673
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:675
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:858
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "用户"
 
-#: setup/class_setupStep_Migrate.inc:861
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "用户组"
 
-#: setup/class_setupStep_Migrate.inc:863
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:867 setup/class_setupStep_Migrate.inc:882
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "创建"
 
-#: setup/class_setupStep_Migrate.inc:872
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "用户"
-
-#: setup/class_setupStep_Migrate.inc:875
-msgid "Groups"
-msgstr "用户组"
-
-#: setup/class_setupStep_Migrate.inc:881
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:919
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:936 include/class_management.inc:697
-#: include/class_listing.inc:551 include/class_xml.inc:58
-#: include/password-methods/class_password-methods-sasl.inc:60
-#: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:393
-#: include/password-methods/class_password-methods.inc:403
-#: include/class_CopyPasteHandler.inc:275 include/functions.inc:3125
-#: include/functions.inc:3146 include/functions.inc:3186
-#: include/functions.inc:3198 include/functions.inc:3202
-#: include/functions.inc:3209 include/functions.inc:3218
-#: include/functions.inc:3280 include/class_msg_dialog.inc:128
-#: include/class_msg_dialog.inc:164 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:687
-#: include/class_msgPool.inc:718 include/class_msgPool.inc:745
-#: include/simpleplugin/class_simpleTabs.inc:91
-#: include/simpleplugin/class_simpleTabs.inc:404
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
-#: 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:297
-#: include/class_SnapshotHandler.inc:453 include/class_plugin.inc:807
-#: include/class_plugin.inc:1555 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
-#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
-msgid "Error"
-msgstr "错误"
-
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:998
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1000
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1085
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1099
-#: setup/class_setupStep_Migrate.inc:1113
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1131
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1153
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1204
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1218
-#: setup/class_setupStep_Migrate.inc:1232
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1315
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1324
-#: setup/class_setupStep_Migrate.inc:1329
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1379
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1423
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "位置名称"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "位置"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "管理员 DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "管理员口令"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status"
-msgstr "状态"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "重试"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "刷新"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:196 setup/class_setupStep_Ldap.inc:198
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "完成"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:125
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:205
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:248
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
-#: include/class_logging.inc:80 include/class_session.inc:50
+#: include/class_logging.inc:81 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:564 include/functions.inc:651
-#: include/functions.inc:772 include/functions.inc:1201
-#: include/functions.inc:2255 include/functions.inc:2297
-#: include/functions.inc:2326 include/class_ldap.inc:873
-#: include/class_ldap.inc:911 include/class_acl.inc:118
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
+#: include/class_ldap.inc:790 include/class_ldap.inc:828
+#: include/class_acl.inc:118
 msgid "Internal error"
 msgstr ""
 
-#: include/class_logging.inc:80
+#: include/class_logging.inc:81
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_logging.inc:102
+#: include/class_logging.inc:103
 #, php-format
 msgid "Invalid option \"%s\" specified!"
 msgstr ""
 
-#: include/class_logging.inc:106
+#: include/class_logging.inc:107
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_management.inc:36 include/class_management.inc:37
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "unconfigured"
-msgstr "未配置"
-
-#: include/class_management.inc:165
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:165
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:333 include/class_management.inc:494
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582 include/class_CopyPasteHandler.inc:245
-#: include/simpleplugin/class_simpleManagement.inc:653
-#: include/simpleplugin/class_simpleManagement.inc:753
-#: include/simpleplugin/class_simpleManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:152
-msgid "Permission"
-msgstr "允许"
-
-#: include/class_management.inc:411
-#: include/simpleplugin/class_simpleManagement.inc:719
-msgid "Permission error"
-msgstr ""
-
-#: include/class_management.inc:494
-#: include/simpleplugin/class_simpleManagement.inc:753
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:514 include/class_management.inc:532
-#: include/class_management.inc:582
-#: include/simpleplugin/class_simpleManagement.inc:804
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr ""
-
-#: include/class_management.inc:697
-#, php-format
-msgid ""
-"No tab declaration for '%s' found in your configuration file. Cannot create "
-"plugin instance!"
-msgstr ""
-
-#: include/class_baseSelector.inc:209 include/class_listing.inc:1188
-#: include/class_listing.inc:1190
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1174
+#: include/class_listing.inc:1176
 msgid "Root"
 msgstr "æ ¹"
 
-#: include/class_baseSelector.inc:261 include/class_listing.inc:1211
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1197
 msgid "Submit"
 msgstr "提交"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1196
-#: include/class_listing.inc:1198
+#: include/class_listing.inc:312 include/class_listing.inc:1182
+#: include/class_listing.inc:1184
 msgid "Up"
 msgstr "上"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 msgid "Down"
 msgstr "关闭"
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:463
 #: include/simpleplugin/attributes/class_SetAttribute.inc:464
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:313
+#: include/class_listing.inc:312
 #: include/simpleplugin/attributes/class_SetAttribute.inc:476
 #: include/simpleplugin/attributes/class_SetAttribute.inc:477
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:374 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:362 setup/setup_migrate_accounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:592
+#: include/class_listing.inc:528
+#: include/password-methods/class_password-methods-sasl.inc:60
+#: include/password-methods/class_password-methods-sasl.inc:86
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 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/class_simpleTabs.inc:71
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
+#: 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/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
+#: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
+msgid "Error"
+msgstr "错误"
+
+#: include/class_listing.inc:569
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1188
+#: include/class_listing.inc:1174
 msgid "Go to root department"
 msgstr "转到根部门"
 
-#: include/class_listing.inc:1196
+#: include/class_listing.inc:1182
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:1190
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1204 include/class_listing.inc:1206
+#: include/class_listing.inc:1190 include/class_listing.inc:1192
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1211
+#: include/class_listing.inc:1197
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: include/class_listing.inc:1332 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1318 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "动作"
 
-#: include/class_listing.inc:1641 include/class_listing.inc:1695
+#: include/class_listing.inc:1631 include/class_listing.inc:1684
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1647 include/class_listing.inc:1683
+#: include/class_listing.inc:1637 include/class_listing.inc:1672
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1655 include/class_listing.inc:1657
-#: include/class_CopyPasteHandler.inc:366
+#: include/class_listing.inc:1645 include/class_listing.inc:1647
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1683
+#: include/class_listing.inc:1672
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1695
+#: include/class_listing.inc:1684
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1729
+#: include/class_listing.inc:1709 include/class_listing.inc:1711
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1743
+#: include/class_listing.inc:1725
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1773 include/class_listing.inc:1774
+#: include/class_listing.inc:1757 include/class_listing.inc:1758
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1783
+#: include/class_listing.inc:1770
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1784
+#: include/class_listing.inc:1771
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_xml.inc:61 include/functions.inc:492
-#: include/functions.inc:3315 include/simpleplugin/class_simplePlugin.inc:272
-#: include/simpleplugin/class_simplePlugin.inc:277
-#: include/simpleplugin/class_simplePlugin.inc:289
-#: html/class_passwordRecovery.inc:116
-msgid "Fatal error"
-msgstr ""
-
-#: include/class_xml.inc:66
-msgid "in"
-msgstr "于"
-
-#: include/class_xml.inc:68
-msgid "on line"
-msgstr ""
-
-#: include/class_xml.inc:69
-msgid "XML error"
-msgstr ""
-
 #: include/password-methods/class_password-methods-sasl.inc:60
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
@@ -949,12 +836,12 @@ msgid ""
 "to use SASL"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:69
-#: include/password-methods/class_password-methods-ssha.inc:73
-#: include/password-methods/class_password-methods-ssha.inc:89
-#: include/functions.inc:661 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:843 include/class_config.inc:856
+#: 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:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -980,308 +867,284 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:301
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1019
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#: plugins/admin/users/class_userManagement.inc:153
+msgid "Permission"
+msgstr "允许"
+
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
 msgstr "登录名"
 
-#: include/class_template.inc:36
-#: include/simpleplugin/class_simpleManagement.inc:211
-#: include/simpleplugin/class_simpleManagement.inc:407
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/class_template.inc:41
+#: include/simpleplugin/class_simpleManagement.inc:282
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "模板"
 
-#: include/class_template.inc:37
+#: include/class_template.inc:42
 msgid "Object template, used to create several objects with similar values"
 msgstr ""
 
-#: include/class_template.inc:41
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/class_template.inc:46
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "Template name"
 msgstr "模板名称"
 
-#: include/functions.inc:104
+#: include/functions.inc:97
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:116
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:474 include/functions.inc:2552
+#: include/simpleplugin/class_simplePlugin.inc:466
+#: include/simpleplugin/class_simplePlugin.inc:471
+#: include/simpleplugin/class_simplePlugin.inc:483
+#: html/class_passwordRecovery.inc:116
+msgid "Fatal error"
+msgstr ""
+
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误:连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:564
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:599
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:651 include/functions.inc:772
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:661
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:850
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制!"
 
-#: include/functions.inc:1123
+#: include/functions.inc:877
 #, 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:1140
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "配置"
 
-#: include/functions.inc:1145
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1546
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1548
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1778
-msgid "Entries per page"
-msgstr "每页条目数"
-
-#: include/functions.inc:1809 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "应用过滤器"
-
-#: include/functions.inc:2077
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:2078
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:2079
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:2080
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:2081
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:2082
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:2083
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:2084
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:2085
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:2117 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2255
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2297
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2326
-msgid "Cannot read to revision file!"
-msgstr ""
-
-#: include/functions.inc:2535
-msgid "'nextIdHook' is not available. Using default base!"
+#: include/functions.inc:1905
+msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2554
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2577
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2584
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2591
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2598
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2605
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2612
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2614
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2618
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2636
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2637
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2640
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2641
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3125 include/functions.inc:3146
-#: include/functions.inc:3186 include/functions.inc:3198
-#: include/functions.inc:3202 include/functions.inc:3209
-#: include/functions.inc:3218
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:3125
-msgid "unknown idAllocation method!"
-msgstr ""
-
-#: include/functions.inc:3146
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:3186
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:3198 include/functions.inc:3202
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:3218
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:3280
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:3316
+#: include/functions.inc:2553
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_msg_dialog.inc:169
+#: include/class_msg_dialog.inc:177
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
@@ -1290,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML 出错于 fusiondirectory.conf: %s ,行 %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, 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:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:844
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:857
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:965
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1095
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "我的账号"
 
@@ -1352,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr "选择在子树中查询"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1601,8 +1464,7 @@ msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
-#: setup/setup_migrate_gosaAccounts.tpl.c:32
-#: ihtml/themes/breezy/islocked.tpl.c:17
+#: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
 #: ihtml/themes/breezy/acl.tpl.c:59
@@ -1610,7 +1472,7 @@ msgid "Cancel"
 msgstr "取消"
 
 #: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
-#: setup/setup_migrate_gosaAccounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
+#: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "应用"
@@ -1682,239 +1544,242 @@ msgid ""
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:616 include/class_msgPool.inc:623
+#: include/class_msgPool.inc:612
 #, 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:635
+#: include/class_msgPool.inc:614
+#, 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
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:646
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:654
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "一月"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "二月"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "三月"
 
-#: include/class_msgPool.inc:662
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "四月"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "五月"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "六月"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "七月"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "八月"
 
-#: include/class_msgPool.inc:663
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "九月"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "十月"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "十一月"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "十二月"
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:673
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:686
-msgid "Database operation failed!"
-msgstr ""
-
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:704
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:705
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:710
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:715 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "对象"
 
-#: include/class_msgPool.inc:729
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:732
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:743
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:745
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:758 include/class_msgPool.inc:761
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:764
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:766
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:776
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:786
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:796
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:806
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:816
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:826
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:836
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:846
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:856
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:866
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:876
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:884
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1956,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2020,81 +1884,87 @@ msgstr ""
 msgid "Toggle information"
 msgstr "切换信息"
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:323 include/class_ldap.inc:370
+#: include/class_ldap.inc:274
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:873
+#: include/class_ldap.inc:790
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN \"%s\": no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:911
+#: include/class_ldap.inc:828
 #, php-format
 msgid "Cannot automatically create subtrees with RDN \"%s\": not supported"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/class_ldap.inc:916
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:918
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1091
+#: include/class_ldap.inc:1008
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1138
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1156
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1159
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1163
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1168
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1199
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_templateHandling.inc:474
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
 #: include/simpleplugin/simple-select-list.xml:11
 msgid "Please select the desired entries"
 msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:60
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2102,13 +1972,12 @@ msgstr "名称"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:65
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "描述"
@@ -2119,11 +1988,13 @@ msgid "POSIX group %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:428
+#: plugins/config/class_configInLdap.inc:476
 #, php-format
 msgid "Role %s"
 msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:430
+#: plugins/config/class_configInLdap.inc:469
 #, php-format
 msgid "Group %s"
 msgstr ""
@@ -2160,8 +2031,8 @@ msgstr "编辑"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:333
-#: include/simpleplugin/attributes/class_FileAttribute.inc:334
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2170,130 +2041,154 @@ msgstr "编辑"
 msgid "Remove"
 msgstr "删除"
 
-#: include/simpleplugin/class_simpleTabs.inc:92
+#: include/simpleplugin/class_simpleTabs.inc:72
 #, php-format
 msgid ""
-"No plugin definitions found to initialize '%s', please check your "
+"No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:322
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
-msgstr "删除进程被插件 '%s' 取消: %s"
-
-#: include/simpleplugin/class_simpleTabs.inc:404
+#: include/simpleplugin/class_simpleTabs.inc:391
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:247
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:265
+#: include/simpleplugin/class_helpersAttribute.inc:248
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:266
+#: include/simpleplugin/class_helpersAttribute.inc:249
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:267
+#: include/simpleplugin/class_helpersAttribute.inc:250
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:251
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:279
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:280
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:281
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "hours"
 msgstr "小时"
 
-#: include/simpleplugin/class_helpersAttribute.inc:282
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "days"
 msgstr "天"
 
-#: include/simpleplugin/class_simpleManagement.inc:217
+#: include/simpleplugin/class_simpleManagement.inc:288
 #: plugins/admin/users/user-list.xml:87
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:244
+#: include/simpleplugin/class_simpleManagement.inc:316
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:401
-#: include/simpleplugin/class_simpleManagement.inc:407
+#: include/simpleplugin/class_simpleManagement.inc:508
+#: include/simpleplugin/class_simpleManagement.inc:514
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "Filter error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:545
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1084
+msgid "Permission error"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1118
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:1169
+#: include/simpleplugin/class_simpleManagement.inc:1249
+#: include/simpleplugin/class_simpleManagement.inc:1267
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:168
+#: include/simpleplugin/class_simplePlugin.inc:343
 msgid "Template settings"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:171
+#: include/simpleplugin/class_simplePlugin.inc:346
 msgid "This is the name of the template"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:272
+#: include/simpleplugin/class_simplePlugin.inc:466
 msgid "Only main tab can compute dn"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:279
+#: include/simpleplugin/class_simplePlugin.inc:473
 #, php-format
 msgid "Could not compute dn: no parent tab class for \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:291
+#: include/simpleplugin/class_simplePlugin.inc:485
 #, php-format
 msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:687
-#: include/simpleplugin/class_simplePlugin.inc:695
-msgid "Error when saving"
-msgstr ""
-
-#: include/simpleplugin/class_simplePlugin.inc:687
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:695
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:760
-#: include/class_plugin.inc:554
+#: include/simpleplugin/class_simplePlugin.inc:1496
 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:1039
+#: include/simpleplugin/class_simplePlugin.inc:1681
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1683
+#, php-format
+msgid "Tab \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1835
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:555
+#: include/simpleplugin/class_Attribute.inc:560
 #: include/simpleplugin/attributes/class_SetAttribute.inc:230
 #, php-format
 msgid "%s (required)"
@@ -2333,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:323
-#: include/simpleplugin/attributes/class_FileAttribute.inc:324
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "上传"
 
@@ -2343,7 +2238,7 @@ msgstr "上传"
 msgid "Download"
 msgstr "下载"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:298
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2394,27 +2289,10 @@ msgstr ""
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:453
+#: include/class_SnapshotHandler.inc:398
 msgid "There was a problem uncompressing snapshot data"
 msgstr ""
 
-#: include/class_plugin.inc:809
-#, php-format
-msgid ""
-"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
-"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
-msgstr ""
-
-#: include/class_plugin.inc:1350
-#, php-format
-msgid "Service \"%s\""
-msgstr ""
-
-#: include/class_plugin.inc:1352
-#, php-format
-msgid "Tab \"%s\""
-msgstr ""
-
 #: include/class_acl.inc:35 include/class_acl.inc:39
 msgid "ACL"
 msgstr "ACL"
@@ -2445,11 +2323,15 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: html/setup.php:59
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "应用过滤器"
+
+#: html/setup.php:60
 msgid "Smarty"
 msgstr ""
 
-#: html/setup.php:59 html/class_passwordRecovery.inc:140
+#: html/setup.php:60 html/class_passwordRecovery.inc:140
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "目录 '%s' 作为编译目录无法访问!"
@@ -2518,36 +2400,31 @@ msgstr "请输入您的口令!"
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,7 +2472,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:651
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2662,225 +2539,8 @@ msgstr "欢迎 %s!"
 msgid "References"
 msgstr "参考"
 
-#: plugins/personal/posix/class_posixAccount.inc:84
-#: plugins/personal/posix/class_posixAccount.inc:113
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:85
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "Home directory"
-msgstr "用户主目录"
-
-#: plugins/personal/posix/class_posixAccount.inc:117
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:122
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group"
-msgstr "主要用户组"
-
-#: plugins/personal/posix/class_posixAccount.inc:128
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:132
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:136
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:140
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:145
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:152
-#: plugins/personal/posix/class_posixAccount.inc:155
-msgid "Group membership"
-msgstr "组成员身份"
-
-#: plugins/personal/posix/class_posixAccount.inc:159
-msgid "Account"
-msgstr "账户"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "User must change password on first login"
-msgstr "用户必须在第一次登录修改口令"
-
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:167
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:172
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:182
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:187
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:199
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:90
-msgid "System trust"
-msgstr "信赖的系统"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Trust mode"
-msgstr "信赖模式"
-
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:94
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "disabled"
-msgstr "禁用"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/personal/posix/class_posixAccount.inc:229
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "full access"
-msgstr "完全访问权限"
-
-#: plugins/personal/posix/class_posixAccount.inc:207
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:98
-msgid "allow access to these hosts"
-msgstr "允许访问这些主机"
-
-#: plugins/personal/posix/class_posixAccount.inc:210
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:301
-msgid "automatic"
-msgstr "自动"
-
-#: plugins/personal/posix/class_posixAccount.inc:320
-msgid "expired"
-msgstr "过期"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "grace time active"
-msgstr "时间限制激活"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "active"
-msgstr "活动"
-
-#: plugins/personal/posix/class_posixAccount.inc:325
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:423
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:426
-#: plugins/admin/groups/class_group.inc:73
-#: plugins/admin/groups/class_group.inc:149
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:482
-#: plugins/admin/groups/class_group.inc:181
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:542
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2907,7 +2567,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 #: 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
@@ -2928,278 +2588,294 @@ msgstr ""
 msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:276
-#: plugins/personal/generic/class_user.inc:282
+#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:284
 #: plugins/admin/users/user-list.xml:79
 msgid "User"
 msgstr "用户"
 
-#: plugins/personal/generic/class_user.inc:277
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
-#: plugins/admin/users/class_userManagement.inc:246
+#: plugins/personal/generic/class_user.inc:285
+#: plugins/admin/users/class_userManagement.inc:245
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:296
+#: plugins/personal/generic/class_user.inc:298
 msgid "User lock status"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "个人信息"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "姓"
 
-#: plugins/personal/generic/class_user.inc:312
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "名"
 
-#: plugins/personal/generic/class_user.inc:317
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:322
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:333
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:337
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "位置"
 
-#: plugins/personal/generic/class_user.inc:341
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "州/省"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "住址"
 
-#: plugins/personal/generic/class_user.inc:345
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/class_user.inc:349
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "电话"
 
-#: plugins/personal/generic/class_user.inc:353
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:358
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "传真"
 
-#: plugins/personal/generic/class_user.inc:366
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:370
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:376
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "显示名称"
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "私人电话"
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "称谓"
 
-#: plugins/personal/generic/class_user.inc:419
+#: plugins/personal/generic/class_user.inc:421
 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:424
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "组织/公司"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "部门"
 
-#: plugins/personal/generic/class_user.inc:428
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/class_user.inc:432
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/class_user.inc:436
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:440
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:444
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:611
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "邮编"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:625
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:644
-#: plugins/personal/generic/class_user.inc:648
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "您需要输入当前口令才能继续。"
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "新口令"
 
-#: plugins/personal/generic/class_user.inc:661
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "输入的新口令和当前口令非常相似。"
 
-#: plugins/personal/generic/class_user.inc:663
-msgid "The password used as new is to short."
-msgstr "输入的新口令太短了。"
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:665
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3308,7 +2984,7 @@ msgid ""
 msgstr ""
 
 #: plugins/config/class_recoveryConfig.inc:78
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:188
 msgid "Login attribute"
 msgstr ""
 
@@ -3431,531 +3107,464 @@ msgstr ""
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-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:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:189
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "端口"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: 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:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: 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:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: 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:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: 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:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: 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:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "模式"
+#: 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:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: 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:442
-msgid "Hooks"
-msgstr "钩子"
+#: plugins/config/class_configInLdap.inc:385
+msgid "Group or role"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
+#: plugins/config/class_configInLdap.inc:390
+msgid "Plugin to blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:396
+msgid "Plugin menu blacklist"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:405
+#: plugins/config/class_configInLdap.inc:433
+msgid "Hooks"
+msgstr "钩子"
+
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:414
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:414
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:419
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "模式"
+
+#: plugins/config/class_configInLdap.inc:419
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:426
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:426
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:440
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: 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_pluginsConfigInLdap.inc:29
@@ -4054,9 +3663,8 @@ msgstr "部门"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:56
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4184,22 +3792,22 @@ msgstr ""
 msgid "Manage user accounts and their properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:190
+#: plugins/admin/users/class_userManagement.inc:191
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:192
 #, php-format
 msgid ""
 "Password method \"%s\" does not support locking. Account \"%s\" has not been"
 " locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/admin/users/class_userManagement.inc:218
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Lock account"
 msgstr ""
 
@@ -4245,7 +3853,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4265,8 +3873,7 @@ msgid "Information"
 msgstr "提示信息"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:60
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4290,164 +3897,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "显示主要组"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "显示主要组"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "显示 samba 用户组"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "对象组"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:33
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "组"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:65
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "成员对象"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:101
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:322
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "信赖的系统"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "组列表"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "信赖模式"
 
-#: plugins/admin/groups/class_group.inc:34
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:37
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "禁用"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "完全访问权限"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID"
-msgstr "强制 GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "允许访问这些主机"
 
-#: plugins/admin/groups/class_group.inc:69
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:73
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:80
-#: plugins/admin/groups/class_group.inc:83
-msgid "Group members"
-msgstr "组成员"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "组列表"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4496,10 +4095,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "模式"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
@@ -4745,13 +4340,11 @@ msgstr ""
 msgid "Add required object classes to the LDAP base"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:5
-#: setup/setup_migrate_gosaAccounts.tpl.c:17
+#: setup/setup_migrate_baseOC.tpl.c:5 setup/setup_migrate_accounts.tpl.c:17
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate_baseOC.tpl.c:8
-#: setup/setup_migrate_gosaAccounts.tpl.c:20
+#: setup/setup_migrate_baseOC.tpl.c:8 setup/setup_migrate_accounts.tpl.c:20
 msgid "After migration"
 msgstr ""
 
@@ -4759,51 +4352,51 @@ msgstr ""
 msgid "Close"
 msgstr "关闭"
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:2
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" 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 ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate_accounts.tpl.c:2
 msgid ""
 "This dialog allows moving a couple of entries to the configured tree. Doing "
 "this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:5
+#: setup/setup_migrate_accounts.tpl.c:5
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "entries. The FusionDirectory setup can't migrate references, so you may want"
 " to cancel the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:8
+#: setup/setup_migrate_accounts.tpl.c:8
 msgid "Move selected entries into this tree"
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:11
+#: setup/setup_migrate_accounts.tpl.c:11
 msgid ""
 "The listed entries are currently invisible in the FusionDirectory interface."
 " If you want to change this for a couple of entries only, just select them "
 "and use the 'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:14
+#: setup/setup_migrate_accounts.tpl.c:14
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: setup/setup_migrate_gosaAccounts.tpl.c:26
+#: setup/setup_migrate_accounts.tpl.c:26
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl.c:2
-msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls"
-" 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 ""
-
-#: setup/setup_migrate.tpl.c:5
-msgid "Check again"
-msgstr ""
-
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
 msgstr ""
@@ -4930,7 +4523,8 @@ msgid ""
 " from getting too much load. The easiest way to handle big databases without"
 " long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr "大小限制选项会让 LDAP 操作更快,以免使 LDAP 服务器过载。最简单让大数据库处理不发成长时间超时的办法是,将查询缩小到更少并且使用过滤器。"
+msgstr ""
+"大小限制选项会让 LDAP 操作更快,以免使 LDAP 服务器过载。最简单让大数据库处理不发成长时间超时的办法是,将查询缩小到更少并且使用过滤器。"
 
 #: ihtml/themes/breezy/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
diff --git a/plugins/addons/dashboard/class_dashBoard.inc b/plugins/addons/dashboard/class_dashBoard.inc
index 873e1a1497ab25ca87fe670c9c4f3a18f24229c5..cb9ec8c49164fa700e1b2a134fe95ea3ce335fe1 100644
--- a/plugins/addons/dashboard/class_dashBoard.inc
+++ b/plugins/addons/dashboard/class_dashBoard.inc
@@ -91,7 +91,7 @@ class dashboard extends simplePlugin
         if (is_array($section)) {
           $section = key($section);
         }
-        $node['priority'] = $config->data['SECTIONS'][$section]['PRIORITY'] * 100 + $pInfos['plPriority'];
+        $node['priority'] = $config->data['SECTIONS'][$section]['PRIORITY'] * 100 + (isset($pInfos['plPriority']) ? $pInfos['plPriority'] : 99);
       } else {
         $node['priority'] = 10000;
       }
diff --git a/plugins/addons/dashboard/class_dashBoardUsers.inc b/plugins/addons/dashboard/class_dashBoardUsers.inc
index c04c61075939cb0e217cb454547702b6b9682a40..79a637fa44fe97673e205e5f43f3f5af8b91642d 100644
--- a/plugins/addons/dashboard/class_dashBoardUsers.inc
+++ b/plugins/addons/dashboard/class_dashBoardUsers.inc
@@ -119,6 +119,7 @@ class dashboardUsers extends simplePlugin
      */
 
     /* getting the date in TIMESTAMP UNIX format */
+    /* 24 * 60 * 60 = 86400 */
     $today        = floor(time() / 86400);
 
     /* Fetch global value from fusiondirectory.conf */
@@ -166,6 +167,7 @@ class dashboardUsers extends simplePlugin
       $manager_phone  = '';
     }
 
+    /* 24 * 60 * 60 = 86400 */
     $human_shadowExpire = date('d.m.Y', $attrs['shadowExpire'][0] * 86400);
 
     return array(
diff --git a/plugins/addons/dashboard/groups_stats.tpl b/plugins/addons/dashboard/groups_stats.tpl
index d23594febbc8d9eb57728b1772a2e57ad784ac1a..f7b7b69c2d66cd6cf6cb88bc9a2ececa06046d27 100644
--- a/plugins/addons/dashboard/groups_stats.tpl
+++ b/plugins/addons/dashboard/groups_stats.tpl
@@ -8,7 +8,7 @@
     <ul>
       {foreach from=$attributes.groups_stats.groups item=g}
         <li style="list-style-image:url({$g.img|escape})">
-        {if $g.nb >= 1}
+        {if $g.nb > 0}
           {t count=$g.nb 1=$g.name 2=$g.nb plural="%2 are %1 groups"}One of them is a %1 group{/t}
         {else}
           {t 1=$g.name}There is no %1 group{/t}
diff --git a/plugins/addons/dashboard/pwd_stats.tpl b/plugins/addons/dashboard/pwd_stats.tpl
index 81a392314cf984c5af6fa8fc31bd38a73a53c972..fa830389da18919a9db2e0ea6adb56c2e0979e6e 100644
--- a/plugins/addons/dashboard/pwd_stats.tpl
+++ b/plugins/addons/dashboard/pwd_stats.tpl
@@ -7,7 +7,7 @@
     {t count=$attributes.pwds_stats.nb 1=$attributes.pwds_stats.nb plural="There are %1 users:"}There is 1 user:{/t}
     <ul>
       {foreach from=$attributes.pwds_stats.methods item=method}
-        {if $method.nb >= 1}
+        {if $method.nb > 0}
           {if $method.style == "default"}
             <li style="color:green;">
           {elseif $method.style == "clear"}
@@ -22,7 +22,7 @@
         {/if}
       {/foreach}
       <li style="list-style-image:url({$attributes.pwds_stats.locked_accounts.img|escape})">
-        {if $attributes.pwds_stats.locked_accounts.nb >= 1}
+        {if $attributes.pwds_stats.locked_accounts.nb > 0}
           {t count=$attributes.pwds_stats.locked_accounts.nb 1=$attributes.pwds_stats.locked_accounts.nb plural="%1 of them are locked"}One of them is locked{/t}
         {else}
           {t}None of them is locked{/t}
diff --git a/plugins/addons/dashboard/users_accounts.tpl b/plugins/addons/dashboard/users_accounts.tpl
index 696b9e7c1f415fb4e196c71ac77bc21a8f8b328c..fcb8f286284a29a58d280dc65e7ce1a5841d4c1d 100644
--- a/plugins/addons/dashboard/users_accounts.tpl
+++ b/plugins/addons/dashboard/users_accounts.tpl
@@ -4,13 +4,13 @@
   </span>
   <div>
     <h1>
-    {if $attributes.expired.accounts|@count >= 1}
+    {if $attributes.expired.accounts|@count > 0}
       {t count=$attributes.expired.accounts|@count 1=$attributes.expired.accounts|@count plural="There are %1 expired accounts"}There is one expired account{/t}
     {else}
       {t}There is no expired account{/t}
     {/if}
     </h1>
-    {if $attributes.expired.accounts|@count >= 1}
+    {if $attributes.expired.accounts|@count > 0}
       <table style="width: 100%;" class="listingTable">
         <colgroup>
           <col width="10%"/>
@@ -54,13 +54,13 @@
      {/if}
 
     <h1>
-    {if $attributes.expired.accounts_next_days|@count >= 1}
+    {if $attributes.expired.accounts_next_days|@count > 0}
       {t count=$attributes.expired.accounts_next_days|@count 1=$attributes.expired.next_days 2=$attributes.expired.accounts_next_days|@count plural="There are %2 accounts expiring in the next %1 days"}There is one account expiring in the next %1 days{/t}
     {else}
       {t 1=$attributes.expired.next_days}There is no account expiring in the next %1 days{/t}
     {/if}
     </h1>
-    {if $attributes.expired.accounts_next_days|@count >= 1}
+    {if $attributes.expired.accounts_next_days|@count > 0}
       <table style="width: 100%;" class="listingTable">
         <colgroup>
           <col width="10%"/>
diff --git a/plugins/addons/dashboard/users_stats.tpl b/plugins/addons/dashboard/users_stats.tpl
index 8ab88c0999bb36fcb3bba890370b542031df11d0..2f963bdafe6fa7375aeea037377c96f5c0a252ab 100644
--- a/plugins/addons/dashboard/users_stats.tpl
+++ b/plugins/addons/dashboard/users_stats.tpl
@@ -8,7 +8,7 @@
     <ul>
       {foreach from=$attributes.users_stats.accounts item=acc}
         <li style="list-style-image:url({$acc.img|escape})">
-        {if $acc.nb >= 1}
+        {if $acc.nb > 0}
           {t count=$acc.nb 1=$acc.name 2=$acc.nb plural="%2 of them have a %1 account"}One of them have a %1 account{/t}
         {else}
           {t 1=$acc.name}None of them have a %1 account{/t}
diff --git a/plugins/admin/acl/class_aclAssignment.inc b/plugins/admin/acl/class_aclAssignment.inc
index 6b49c5ffff200de01fadb6e0d5401259d24dd6e6..04e799e2ddd6f9d9e48ac6fdf81d08c3b06666c7 100644
--- a/plugins/admin/acl/class_aclAssignment.inc
+++ b/plugins/admin/acl/class_aclAssignment.inc
@@ -217,7 +217,7 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
         } else {
           $value['role'] = $newvalue;
         }
-      } elseif (in_array($source['CLASS'], array('user','group','roleGeneric')) && (($member_key = array_search($oldvalue, $value['members'])) !== FALSE)) {
+      } 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]);
         } elseif ($source['MODE'] == 'move') {
@@ -225,7 +225,7 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
         } elseif ($source['MODE'] == 'copy') {
           $value['members'][] = $newvalue;
         }
-      } elseif (!in_array($source['CLASS'], array('aclRole','user','group','roleGeneric'))) {
+      } elseif (!in_array($source['CLASS'], array('aclRole','user','posixGroup','roleGeneric'))) {
         trigger_error('unknown source '.$source['CLASS']);
       }
     }
@@ -237,9 +237,9 @@ class ACLsAssignmentAttribute extends DialogOrderedArrayAttribute
     foreach ($this->value as $value) {
       if (($source['CLASS'] == 'aclRole') && ($value['role'] == $oldvalue)) {
         return TRUE;
-      } elseif (in_array($source['CLASS'], array('user','group','roleGeneric')) && in_array($oldvalue, $value['members'])) {
+      } elseif (in_array($source['CLASS'], array('user','posixGroup','roleGeneric')) && in_array($oldvalue, $value['members'])) {
         return TRUE;
-      } elseif (!in_array($source['CLASS'], array('aclRole','user','group','roleGeneric'))) {
+      } elseif (!in_array($source['CLASS'], array('aclRole','user','posixGroup','roleGeneric'))) {
         trigger_error('unknown source '.$source['CLASS']);
       }
     }
@@ -277,7 +277,7 @@ class aclAssignment extends simplePlugin
         'gosaAclEntry' => array(
           array('aclRole',      'dn', 'gosaAclEntry=*:*:%b|oldvalue%:*'),
           array('user',         'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
-          array('group',        'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
+          array('posixGroup',   'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
           array('roleGeneric',  'dn', 'gosaAclEntry=*:*:*:*%b|oldvalue%*'),
         )
       ),
@@ -320,7 +320,7 @@ class aclAssignment extends simplePlugin
     if ($this->is_account) {
       return parent::save();
     } else {
-      $this->remove_from_parent();
+      return $this->remove_from_parent();
     }
   }
 
diff --git a/plugins/admin/acl/class_aclManagement.inc b/plugins/admin/acl/class_aclManagement.inc
index 41e51104edc9594e0f65e282526a68966efa70e9..09fd3694605685c868a59c0e2a7e9d5a88769df7 100644
--- a/plugins/admin/acl/class_aclManagement.inc
+++ b/plugins/admin/acl/class_aclManagement.inc
@@ -166,7 +166,7 @@ class aclManagement extends simpleManagement
 
   function configureHeadpage ()
   {
-    /* Remove department types so that we don't mistake assignments with them. */
+    /* Remove department types so that we don't mistake assignments with them */
     $this->headpage->objectTypes = array();
     $this->headpage->registerElementFilter('filterLabel', 'aclManagement::filterLabel');
     parent::configureHeadpage();
@@ -175,7 +175,7 @@ class aclManagement extends simpleManagement
   /*!
    * \brief  This method intiates the object creation.
    */
-  function newEntry($action = '', $target = array(), $all = array(), $altTabClass = '', $altTabType = '', $altAclCategory = '')
+  function newEntry($action, array $target, array $all)
   {
     $this->dialogObject = new aclAssignmentCreationDialog($this);
   }
@@ -208,11 +208,10 @@ class aclManagement extends simpleManagement
     }
     $ou .= "  &nbsp; ["._("ACL Assignment")."]";
 
-    $dn = LDAP::fix($dn);
     return "<a href='?plug=".$_GET['plug']."&amp;PID=$pid&amp;act=listing_edit_$row' title='$dn'>$ou</a>";
   }
 
-  protected function removeEntryRequested($action = "", $target = array(), $all = array())
+  protected function removeEntryRequested($action, array $target, array $all)
   {
     $result = parent::removeEntryRequested($action, $target, $all);
     if ($result != "") {
diff --git a/plugins/admin/departments/class_department.inc b/plugins/admin/departments/class_department.inc
index 4094fcb7cb73eb884850062a4264898afe83aaaf..510c431a9f555dcafc8a22aa0ab8ac9299f056e3 100644
--- a/plugins/admin/departments/class_department.inc
+++ b/plugins/admin/departments/class_department.inc
@@ -166,8 +166,10 @@ class department extends simplePlugin
 
     $namingAttr = static::$namingAttr;
 
-    if (tests::is_department_name_reserved($this->$namingAttr, $this->base)) {
-      $message[] = msgPool::reserved(_("Name"));
+    if ($namingAttr == 'ou') {
+      if (tests::is_department_name_reserved($this->$namingAttr)) {
+        $message[] = msgPool::reserved(_('Name'));
+      }
     }
 
     return $message;
@@ -195,14 +197,4 @@ class department extends simplePlugin
     return parent::prepare_save();
   }
 }
-    /* Hide base selector, if this object represents the base itself
-
-    $smarty->assign("is_root_dse", FALSE);
-    if ($this->dn == $config->current['BASE']) {
-      $smarty->assign("is_root_dse", TRUE);
-      $nA = $this->namingAttr."ACL";
-      $smarty->assign($nA, $this->getacl($this->namingAttr, TRUE));
-    }*/
-
-
 ?>
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index eccb920cb5fb76527fd1afc2b3594b205638056e..38d5c44de095e30052ad36b26ee1ec09271ff306 100644
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -81,7 +81,7 @@ class departmentManagement extends simpleManagement
   }
 
   // Overridden remove request method - Avoid removal of the ldap base.
-  protected function removeEntryRequested($action = "", $target = array(), $all = array())
+  protected function removeEntryRequested($action, array $target, array $all)
   {
     global $config;
     $target = array_remove_entries(array($config->current['BASE']), $target);
@@ -95,14 +95,14 @@ class departmentManagement extends simpleManagement
     if ($dn == $base) {
       $ou = ".";
     }
-    $dn = LDAP::fix(func_get_arg(1));
+    $dn = func_get_arg(1);
     return "<a href='?plug=".$_GET['plug']."&amp;PID=$pid&amp;act=listing_open_$row' title='$dn'>$ou</a>";
   }
 
   // Finally remove departments and update departmnet browsers
-  function removeEntryConfirmed($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
+  function removeEntryConfirmed($action, array $target, array $all)
   {
-    parent::removeEntryConfirmed($action, $target, $all, $altTabClass, $altTabType, $altAclCategory);
+    parent::removeEntryConfirmed($action, $target, $all);
     $this->refreshDeps();
   }
 
diff --git a/plugins/admin/departments/class_locality.inc b/plugins/admin/departments/class_locality.inc
index fc6bd69ac2b66cb7adcc4b7e323ea6eeaeb17328..aadf109629af7eba0d920edfd8a342f1983ea168 100644
--- a/plugins/admin/departments/class_locality.inc
+++ b/plugins/admin/departments/class_locality.inc
@@ -32,7 +32,7 @@ class locality extends department
       'plObjectType'  => array('locality' => array(
         'aclCategory' => 'department',
         'name'        => _('Locality'),
-        'filter'      => '(&(objectClass=locality)(objectClass=gosaDepartment))',
+        'filter'      => '(&(!(objectClass=dcObject))(objectClass=locality)(objectClass=gosaDepartment))',
         'ou'          => '',
         'icon'        => 'geticon.php?context=types&icon=locality&size=16',
         'tabClass'    => 'deptabs',
diff --git a/plugins/admin/departments/main.inc b/plugins/admin/departments/main.inc
index a20dcd42dbd0c2a1b937783a6d094812b1f2f37c..d4c2fba52c3acea3213a9468523558bc3af0af26 100644
--- a/plugins/admin/departments/main.inc
+++ b/plugins/admin/departments/main.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
@@ -20,35 +19,5 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* Remove locks created by this plugin */
-if ($remove_lock){
-  if(session::is_set('departmentManagement')){
-      $macl = session::get('departmentManagement');
-      $macl->remove_lock();
-  }
-}
-
-/* Remove this plugin from session */
-if ( $cleanup ){
-  session::un_set('departmentManagement');
-}else{
-
-  /* Reset requested? */
-  if (isset($_GET['reset']) && $_GET['reset'] == 1){
-    session::un_set ('departmentManagement');
-  }
-
-  /* Create usermanagement object on demand */
-  if (!session::is_set('departmentManagement')){
-    $departmentManagement = new departmentManagement ();
-    session::set('departmentManagement',$departmentManagement);
-  }
-  $departmentManagement = session::get('departmentManagement');
-  $display= $departmentManagement->execute();
-
-  /* Show and save dialog */
-  session::set('departmentManagement',$departmentManagement);
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+simpleManagement::mainInc('departmentManagement');
 ?>
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index b6328521190eae66a7397d6600ffa6902dc1f39e..3058f6c5c6c0a3f873c679d69cd82eb014ce8763 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -23,12 +23,14 @@ class deptabs extends simpleTabs
 {
   function save()
   {
-    parent::save();
+    $errors = parent::save();
 
     /* Update department cache */
     global $config;
     $config->get_departments();
     $config->make_idepartments();
+
+    return $errors;
   }
 }
 ?>
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
deleted file mode 100644
index 58448b1143ec46fb2edcfb0c713a8ecbdbe7e901..0000000000000000000000000000000000000000
--- a/plugins/admin/groups/class_group.inc
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  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.
-*/
-
-class group extends simplePlugin
-{
-  var $objectclasses    = array('posixGroup');
-
-  static function plInfo()
-  {
-    if (class_available('mixedGroup')) {
-      return array();
-    }
-    return array(
-      'plShortName'   => _('Group'),
-      'plDescription' => _('POSIX group information'),
-      'plSelfModify'  => FALSE,
-      'plObjectType'  => array('group' => array(
-        'name'        => _('POSIX group'),
-        'description' => _('POSIX user group'),
-        'ou'          => get_ou('groupRDN'),
-        'filter'      => 'objectClass=posixGroup',
-        'icon'        => 'geticon.php?context=types&icon=user-group&size=16',
-        'mainAttr'    => 'cn',
-      )),
-      'plForeignKeys'  => array(
-        'memberUid' => array('user','uid')
-      ),
-
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
-    );
-  }
-
-  static function getAttributesInfo ()
-  {
-    return array(
-      'main' => array(
-        'name'  => _('Properties'),
-        'attrs' => array(
-          new BaseSelectorAttribute(get_ou('groupRDN')),
-          new StringAttribute(
-            _('Name'), _('Name of this group'),
-            'cn', TRUE,
-            '', '', (strict_uid_mode() ? '/^[a-z0-9_-]+$/' : '/^[a-z0-9_.-]+$/i')
-          ),
-          new TextAreaAttribute(
-            _('Description'), _('Short description of this group'),
-            'description', FALSE
-          ),
-          new BooleanAttribute(
-            _('Force GID'), _('Force GID value for this group'),
-            'force_id', FALSE
-          ),
-          new IntAttribute(
-            _('GID'), _('GID value for this group'),
-            'gidNumber', FALSE,
-            0, FALSE, ''
-          )
-        )
-      ),
-      'members' => array(
-        'name'  => _('Group members'),
-        'attrs' => array(
-          new UsersAttribute(
-            '', _('Group members'),
-            'memberUid', FALSE,
-            array(), 'uid'
-          )
-        )
-      ),
-      'system_trust' => array(
-        'name'  => _('System trust'),
-        'icon'  => 'geticon.php?context=status&icon=locked&size=16',
-        'attrs' => array(
-          new SelectAttribute(
-            _('Trust mode'), _('Type of authorization for those hosts'),
-            'trustMode', FALSE,
-            array('', 'fullaccess', 'byhost'),
-            '',
-            array(_('disabled'), _('full access'), _('allow access to these hosts'))
-          ),
-          new SystemsAttribute(
-            '', _('Only allow this group to connect to this list of hosts'),
-            'host', FALSE
-          )
-        )
-      )
-    );
-  }
-
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
-  {
-    parent::__construct($dn, $object, $parent, $mainTab);
-
-    $this->attributesAccess['trustMode']->setInLdap(FALSE);
-    $this->attributesAccess['trustMode']->setManagedAttributes(
-      array(
-        'multiplevalues' => array('notbyhost' => array('','fullaccess')),
-        'erase' => array(
-          'notbyhost' => array('host')
-        )
-      )
-    );
-    if ((count($this->host) == 1) && ($this->host[0] == '*')) {
-      $this->trustMode = 'fullaccess';
-    } elseif (count($this->host) > 0) {
-      $this->trustMode = 'byhost';
-    }
-
-    $this->attributesAccess['gidNumber']->setUnique(TRUE);
-    $this->attributesAccess['force_id']->setInLdap(FALSE);
-    $this->attributesAccess['force_id']->setManagedAttributes(
-      array(
-        'disable' => array (
-          FALSE => array (
-            'gidNumber',
-          )
-        )
-      )
-    );
-  }
-
-  function check()
-  {
-    global $config;
-    $message = parent::check();
-
-    /* Check ID's if they are forced by user */
-    if ($this->force_id) {
-      if ($this->gidNumber < $config->get_cfg_value("minId")) {
-        $message[] = msgPool::toosmall(_("GID"), $config->get_cfg_value("minId"));
-      }
-    }
-
-    return $message;
-  }
-
-  function resetCopyInfos()
-  {
-    parent::resetCopyInfos();
-
-    $this->force_id = FALSE;
-    $this->attributesAccess['gidNumber']->setInitialValue("");
-    $this->gidNumber = "";
-  }
-
-  function prepare_save()
-  {
-    if (!$this->force_id) {
-      /* Handle gidNumber */
-      if ($this->attributesAccess['gidNumber']->getInitialValue() != "") {
-        $this->gidNumber = $this->attributesAccess['gidNumber']->getInitialValue();
-      } else {
-        /* Calculate new id's. We need to place a lock before calling get_next_id
-           to get real unique values.
-         */
-        $wait = 10;
-        while (get_lock("gidnumber") != "") {
-          sleep (1);
-
-          /* Oups - timed out */
-          if ($wait-- == 0) {
-            msg_dialog::display(_("Warning"), _("Timeout while waiting for lock. Ignoring lock!"), WARNING_DIALOG);
-            break;
-          }
-        }
-        add_lock ("gidnumber", "gosa");
-        $this->gidNumber = get_next_id("gidNumber", $this->dn);
-      }
-    }
-
-    $this->updateAttributesValues();
-    parent::prepare_save();
-
-    if ($this->trustMode == 'fullaccess') {
-      $this->attrs['host'] = array('*');
-    }
-
-    /* Trust accounts */
-    if (($this->trustMode != "") && !in_array('hostObject', $this->attrs['objectClass'])) {
-      $this->attrs['objectClass'][] = 'hostObject';
-    } elseif (($this->trustMode == "") && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
-      unset($this->attrs['objectClass'][$key]);
-    }
-  }
-
-  protected function post_save()
-  {
-    del_lock("gidnumber");
-    parent::post_save();
-  }
-
-  function addUser($dn, $uid)
-  {
-    $this->attributesAccess['memberUid']->addValue($dn,
-      array(
-        'dn'  => $dn,
-        'uid' => array($uid),
-        'cn'  => array($uid)
-      )
-    );
-  }
-
-  function removeUser($uid)
-  {
-    $this->attributesAccess['memberUid']->searchAndRemove($uid);
-  }
-}
-
-?>
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index c42e34c449ef4d0a227dce6622f32f085cfe566e..7cd3d89a6da81b40cba8f5718ab11e9633167998 100644
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -25,6 +25,8 @@ class groupManagement extends simpleManagement
 
   protected $autoFilter = FALSE;
 
+  public static $skipTemplates = TRUE;
+
   static function plInfo()
   {
     return array(
@@ -49,6 +51,29 @@ class groupManagement extends simpleManagement
     $this->headpage->registerElementFilter('filterProperties', 'groupManagement::filterProperties');
   }
 
+  function configureFilter ()
+  {
+    parent::configureFilter();
+
+    if (!class_available('posixGroup')) {
+      /* If posix plugin is not installed, ignore posix filter */
+      $this->filter->elements['PRIMARY']['unset']  = '';
+      $this->filter->elements['PRIMARY']['set']    = '';
+    }
+    if (!class_available('mailAccount') || !class_available('posixGroup')) {
+      $this->filter->elements['MAIL']['unset']  = '';
+      $this->filter->elements['MAIL']['set']    = '';
+    }
+    if (!class_available('sambaAccount') || !class_available('posixGroup')) {
+      $this->filter->elements['SAMBA']['unset']  = '';
+      $this->filter->elements['SAMBA']['set']    = '';
+    }
+    if (static::$skipTemplates) {
+      $this->filter->elements['FILTERTEMPLATE']['unset']  = '';
+      $this->filter->elements['FILTERTEMPLATE']['set']    = '';
+    }
+  }
+
   static function filterProperties($row, $dn, $objectType, $attrs, $gosaGroupObjects = NULL)
   {
     global $config;
@@ -71,7 +96,7 @@ class groupManagement extends simpleManagement
       }
       if (empty($grouptabs)) {
         foreach ($config->data['TABS']['GROUPTABS'] as $plug) {
-          if ($plug['CLASS'] == 'group') {
+          if ($plug['CLASS'] == 'posixGroup') {
             continue;
           }
           if (class_available($plug['CLASS'])) {
@@ -126,19 +151,21 @@ class groupManagement extends simpleManagement
     $smarty = get_smarty();
     $filters = array(
       array('id'  => 'USER',        'label'  => _('Show user groups')),
-      array('id'  => 'PRIMARY',     'label'  => _('Show primary groups')),
       array('id'  => 'ROLE',        'label'  => _('Show organizational roles')),
       array('id'  => 'APPLICATION', 'label'  => _('Show application groups')),
       array('id'  => 'UNKNOWN',     'label'  => _('Show unidentified groups')),
     );
-    if (class_available('mailAccount')) {
-      $filters[]= array('id'  => 'MAIL',        'label'  => _('Show mail groups'));
-    }
-    if (class_available('sambaAccount')) {
-      $filters[]= array('id'  => 'SAMBA',       'label'  => _('Show samba groups'));
+    if (class_available('posixGroup')) {
+      $filters[] = array('id'  => 'PRIMARY',  'label'  => _('Show primary groups'));
+      if (class_available('mailAccount')) {
+        $filters[] = array('id'  => 'MAIL',  'label'  => _('Show mail groups'));
+      }
+      if (class_available('sambaAccount')) {
+        $filters[] = array('id'  => 'SAMBA', 'label'  => _('Show samba groups'));
+      }
     }
     if (class_available('simpleSecurityObject')) {
-      $filters[]= array('id'  => 'SIMPLESECURITYOBJECT',       'label'  => _('Show DSA entries'));
+      $filters[] = array('id'  => 'SIMPLESECURITYOBJECT',  'label'  => _('Show DSA entries'));
     }
     if (class_available('systemManagement')) {
       $filters = array_merge(
@@ -153,8 +180,16 @@ class groupManagement extends simpleManagement
         )
       );
     }
+    if (!static::$skipTemplates) {
+      $filters[] = array(
+        'id'    => 'FILTERTEMPLATE',
+        'label' => sprintf(_('Show %s'), _('Template'))
+      );
+    }
     $smarty->assign('objectFilters', $filters);
-    return management::renderList();
+    $this->headpage->update();
+    $display = $this->headpage->render();
+    return $this->getHeader().$display;
   }
 }
 ?>
diff --git a/plugins/admin/groups/class_ogroup.inc b/plugins/admin/groups/class_ogroup.inc
index 731b94c4f3d6c7e9fe5afe63da0714853ed7ae2e..e88402db3241b616bd8e80a5276cd7b433568743 100644
--- a/plugins/admin/groups/class_ogroup.inc
+++ b/plugins/admin/groups/class_ogroup.inc
@@ -21,11 +21,9 @@
 
 class ObjectsAttribute extends GenericDialogAttribute
 {
-  //TODO : insert in black list used workstations
   protected $dialogClass  = 'ObjectSelectDialog';
   protected $types        = array();
 
-
   function getFilterBlackList ()
   {
     return array(
@@ -60,11 +58,11 @@ class ObjectsAttribute extends GenericDialogAttribute
       }
       if (!isset($this->displays[$i])) {
         trigger_error('Unkown type for "'.$this->value[$i].'"');
-        $this->displays[$i] = sprintf(_('Unknown type : %s'), LDAP::fix($this->value[$i]));
+        $this->displays[$i] = sprintf(_('Unknown type : %s'), $this->value[$i]);
         $this->types[$i]    = 'I';
       }
     } else {
-      $this->displays[$i] = sprintf(_('Non existing dn: %s'), LDAP::fix($this->value[$i]));
+      $this->displays[$i] = sprintf(_('Non existing dn: %s'), $this->value[$i]);
       $this->types[$i]    = 'I';
     }
   }
@@ -115,7 +113,7 @@ class ObjectsAttribute extends GenericDialogAttribute
 
   function listObjectTypes()
   {
-    /* refresh types and displays */
+    /* Refresh types and displays */
     $this->getDisplayValues();
     return '['.join(array_unique($this->types)).']';
   }
@@ -169,7 +167,7 @@ class ogroup extends simplePlugin
       'plForeignKeys'  => array(
         'member' => array(
           array('user'),
-          array('group'),
+          array('posixGroup'),
           array('applicationGeneric'),
           array('serverGeneric'),
           array('workstationGeneric'),
@@ -235,7 +233,6 @@ class ogroup extends simplePlugin
 
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
   {
-    global $config;
     parent::__construct($dn, $object, $parent, $mainTab);
 
     $this->attributesAccess['trustMode']->setInLdap(FALSE);
@@ -256,25 +253,23 @@ class ogroup extends simplePlugin
     /* Detect all workstations, which are already assigned to an object group
         - Those objects will be hidden in the add object dialog.
         - Check() will complain if such a system is assigned to this object group.*/
-    $base = $config->current['BASE'];
-    $res  = get_list("(|(objectClass=gotoWorkstation)(objectClass=gotoTerminal))", "none",
-                      $base, array("dn"), GL_NO_ACL_CHECK | GL_SUBSEARCH);
-    $ws_dns = array();
-    foreach ($res as $data) {
-      $ws_dns[] = $data['dn'];
-    }
-    $res = get_list("(&(member=*)(objectClass=gosaGroupOfNames)(|(gosaGroupObjects=[W])(gosaGroupObjects=[T])))", "none",
-                    $base, array("dn","member"), GL_NO_ACL_CHECK | GL_SUBSEARCH);
     $this->used_workstations = array();
-    foreach ($res as $og) {
-      if ($og['dn'] == $this->dn) {
+    try {
+      $ws_dns = array_keys(objects::ls(array('workstation','terminal')));
+      $res = objects::ls('ogroup', array('member' => '*'), NULL, '(&(member=*)(|(gosaGroupObjects=[W])(gosaGroupObjects=[T])))');
+    } catch (NonExistingObjectTypeException $e) {
+      /* If workstation/terminal objectType is not existing, systems plugin is missing so there are no systems */
+      $ws_dns = array();
+      $res    = array();
+    }
+    foreach ($res as $odn => $og) {
+      if ($odn == $this->dn) {
         continue;
       }
       $this->used_workstations = array_merge($this->used_workstations, array_intersect($ws_dns, $og['member']));
     }
 
     $this->reload();
-    $this->updateAttributesValues();
   }
 
   /*! \brief This function returns an LDAP filter for this plugin object classes
diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml
index deb01de124b95a8f0c138f675c9bf2e4d40e6200..b1cceb045c1b74add880b47e25b51945222eb7d4 100644
--- a/plugins/admin/groups/group-filter.xml
+++ b/plugins/admin/groups/group-filter.xml
@@ -10,12 +10,20 @@
   <search>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(|(&amp;(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&amp;(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$SIMPLESECURITYOBJECT$UNKNOWN)))$NAME)</filter>
+      <filter>(&amp;(|$PRIMARY$MAIL$SAMBA$ROLE$FILTERTEMPLATE(&amp;(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$SIMPLESECURITYOBJECT$UNKNOWN)))$NAME)</filter>
       <attribute>*</attribute>
     </query>
     <scope>auto</scope>
   </search>
 
+  <element>
+    <type>checkbox</type>
+    <tag>FILTERTEMPLATE</tag>
+    <default></default>
+    <unset></unset>
+    <set>(objectClass=fdTemplate)</set>
+  </element>
+
   <element>
     <type>checkbox</type>
     <tag>PRIMARY</tag>
@@ -29,7 +37,7 @@
     <tag>MAIL</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=gosaMailAccount)</set>
+    <set>(&amp;(objectClass=posixGroup)(objectClass=gosaMailAccount))</set>
   </element>
 
   <element>
@@ -37,7 +45,7 @@
     <tag>SAMBA</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=sambaGroupMapping)</set>
+    <set>(&amp;(objectClass=posixGroup)(objectClass=sambaGroupMapping))</set>
   </element>
 
   <element>
@@ -147,7 +155,7 @@
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAP</backend>
-      <filter>(&amp;(|(objectClass=posixGroup)$ROLE(objectClass=groupOfNames))(|(cn=*$NAME*)(description=*$NAME*)))</filter>
+      <filter>(&amp;(|(objectClass=posixGroup)$ROLE$FILTERTEMPLATE(objectClass=groupOfNames))(|(cn=*$NAME*)(description=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
diff --git a/plugins/admin/groups/tabs_ogroups.inc b/plugins/admin/groups/tabs_ogroups.inc
index 90bf7337a998c151fad1cf4feea817c9e90358e5..63c215b2edfce7999f16a2df105ceb8ffb754b56 100644
--- a/plugins/admin/groups/tabs_ogroups.inc
+++ b/plugins/admin/groups/tabs_ogroups.inc
@@ -110,7 +110,8 @@ class ogrouptabs extends simpleTabs_noSpecial
   {
     @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $class, 'Adding tab ');
     $plInfos = pluglist::pluginInfos($class);
-    $this->by_name[$class]            = $plInfos['plShortName'];
+    $this->by_name[$class]  = $plInfos['plShortName'];
+    $this->plNotify[$class] = FALSE;
     if (isset($this->removed_tabs[$class])) {
       $this->by_object[$class] = $this->removed_tabs[$class];
       unset($this->removed_tabs[$class]);
@@ -125,6 +126,7 @@ class ogrouptabs extends simpleTabs_noSpecial
     $this->removed_tabs["$class"] = $this->by_object["$class"];
     unset($this->by_object["$class"]);
     unset($this->by_name["$class"]);
+    unset($this->plNotify["$class"]);
   }
 
   function gen_tabs($disabled = FALSE)
@@ -147,11 +149,14 @@ class ogrouptabs extends simpleTabs_noSpecial
       @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Removing");
 
       $obj->dn = $this->dn;
-      $obj->remove_from_parent();
+      $errors = $obj->remove_from_parent();
+      if (!empty($errors)) {
+        msg_dialog::displayChecks($errors);
+      }
     }
     unset($obj);
 
-    parent::save();
+    return parent::save();
   }
 
   function save_object($save_current = FALSE)
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 7b7b2977e62c30fc6615ec284fb5469122912dcf..ea5c60bbf125fad323f7bd9d23410cdece63e117 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -34,7 +34,7 @@ class userManagement extends simpleManagement
   protected $autoFilter       = FALSE;
   protected $autoActions      = FALSE;
 
-  protected $skipTemplates = FALSE;
+  public static $skipTemplates = FALSE;
 
   static function plInfo()
   {
@@ -121,7 +121,7 @@ class userManagement extends simpleManagement
 
   /* !\brief  Lock/unlock multiple users.
    */
-  function lockUsers($action, $target, $all)
+  function lockUsers($action, array $target, array $all)
   {
     if (!count($target)) {
       return;
@@ -141,6 +141,7 @@ class userManagement extends simpleManagement
     global $config, $ui;
     // Filter out entries we are not allowed to modify
     $disallowed = array();
+    $allowed    = array();
     foreach ($entry as $dn) {
       if (!preg_match('/w/', $ui->get_permissions($dn, 'user/user', 'userLock'))) {
         $disallowed[] = $dn;
@@ -191,8 +192,6 @@ class userManagement extends simpleManagement
                 sprintf(_('Password method "%s" does not support locking. Account "%s" has not been locked!'),
                   $hn, $dn), WARNING_DIALOG);
           }
-        } else {
-          // Can't lock unknown methods.
         }
       }
     }
@@ -247,7 +246,7 @@ class userManagement extends simpleManagement
                        'name="listing_edit_tab_user_'.$row.'"/>';
     if (!empty($attrs)) {
       if (in_array_ics ('fdTemplate', $attrs['objectClass'])) {
-        $attrs = plugin::tpl_template_to_attrs($attrs);
+        $attrs = templateHandling::fieldsFromLDAP($attrs);
       }
       foreach ($usertabs as $class => $usertab) {
         if ($usertab->is_this_account($attrs)) {
diff --git a/plugins/admin/users/main.inc b/plugins/admin/users/main.inc
index d410de28a6e2608ef0da886718ba243d0134751c..b982a5740f7ffc8aa0852dbe72e740fe8c500c58 100644
--- a/plugins/admin/users/main.inc
+++ b/plugins/admin/users/main.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
@@ -20,34 +19,5 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/* Remove locks created by this plugin */
-if ($remove_lock){
-  if(session::is_set('userManagement')){
-      $macl = session::get('userManagement');
-      $macl->remove_lock();
-  }
-}
-
-/* Remove this plugin from session */
-if ( $cleanup ){
-  session::un_set('userManagement');
-}else{
-
-  /* Reset requested? */
-  if (isset($_GET['reset']) && $_GET['reset'] == 1){
-    session::un_set ('userManagement');
-  }
-
-  /* Create usermanagement object on demand */
-  if (!session::is_set('userManagement')){
-    $userManagement = new userManagement ();
-    session::set('userManagement',$userManagement);
-  }
-  $userManagement = session::get('userManagement');
-  $display= $userManagement->execute();
-
-  /* Show and save dialog */
-  session::set('userManagement',$userManagement);
-}
-
+simpleManagement::mainInc('userManagement');
 ?>
diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl
index 5629779ba77c94aac2b25b31c45fa66da4e2a8da..b75b215e083631eda2c2689dc7420fffcdc0032c 100644
--- a/plugins/admin/users/user-filter.tpl
+++ b/plugins/admin/users/user-filter.tpl
@@ -3,7 +3,7 @@
 </div>
 
 <div class="contentboxb">
-  {$TEMPLATES}&nbsp;<label for='TEMPLATES'>{t}Show templates{/t}</label><br/>
+  {$FILTERTEMPLATE}&nbsp;<label for='FILTERTEMPLATE'>{t}Show templates{/t}</label><br/>
   {$FUNCTIONAL}&nbsp;<label for='FUNCTIONAL'>{t}Show functional users{/t}</label><br/>
   {if $USE_POSIX}
     {$POSIX}&nbsp;<label for='POSIX'>{t}Show POSIX users{/t}</label><br/>
diff --git a/plugins/admin/users/user-filter.xml b/plugins/admin/users/user-filter.xml
index f79a1f1a68db4a22598a0a3cd394dcd39b0e5991..ef78f3fa54190b362fccb08e1cbce3c586c45996 100644
--- a/plugins/admin/users/user-filter.xml
+++ b/plugins/admin/users/user-filter.xml
@@ -10,7 +10,7 @@
   <search>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;$NAME(|(&amp;(objectClass=inetOrgPerson)(|$FUNCTIONAL$SAMBA$POSIX$MAIL))$TEMPLATES))</filter>
+      <filter>(&amp;$NAME(|(&amp;(objectClass=inetOrgPerson)(|$FUNCTIONAL$SAMBA$POSIX$MAIL))$FILTERTEMPLATE))</filter>
       <attribute>*</attribute>
     </query>
     <scope>auto</scope>
@@ -37,7 +37,7 @@
 
   <element>
     <type>checkbox</type>
-    <tag>TEMPLATES</tag>
+    <tag>FILTERTEMPLATE</tag>
     <default></default>
     <unset></unset>
     <set>(objectClass=fdTemplate)</set>
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 8b29b79fd6669cd1b297a2becd3f7ed74609d864..f3bddbe0ffbd01d12dd2145606c7703b93c4db90 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -106,15 +106,42 @@ class configInLdap extends simplePlugin
           new HiddenAttribute ('fusionConfigMd5'),
         )
       ),
-      'schema_setup' => array(
-        'name'  => _('Schema setup'),
+      'core_settings' => array(
+        'name'  => _('Core settings'),
         'attrs' => array(
+          new IntAttribute (
+            _('LDAP size limit'), _('Defines the number of entries to get from LDAP by default.'),
+            'fdLdapSizeLimit', FALSE,
+            0 /*min*/, FALSE /*no max*/, 200
+          ),
+          new SelectAttribute (
+            _('Edit locking'),
+            _('Check if a entry currently being edited has been modified outside of FusionDirectory in the meantime.'),
+            'fdModificationDetectionAttribute', FALSE,
+            array('', 'entryCSN', 'contextCSN'), 'entryCSN'
+          ),
+          new BooleanAttribute (
+            _('Enable logging'),
+            _('Event logging on FusionDirectory side.'),
+            'fdLogging', FALSE,
+            TRUE
+          ),
           new BooleanAttribute (
             _('Schema validation'),
             _('Enables schema checking during login.'),
             'fdSchemaCheck', FALSE,
             TRUE
           ),
+          new BooleanAttribute (
+            _('Enable snapshots'), _('This enables you to save certain states of entries and restore them later on.'),
+            'fdEnableSnapshots', FALSE,
+            TRUE
+          ),
+          new StringAttribute (
+            _('Snapshot base'), _('The base where snapshots should be stored inside of the LDAP.'),
+            'fdSnapshotBase', FALSE,
+            'ou=snapshots,'.$config->current['BASE']
+          ),
         )
       ),
       'password' => array(
@@ -154,34 +181,6 @@ class configInLdap extends simplePlugin
           ),
         )
       ),
-      'core_settings' => array(
-        'name'  => _('Core settings'),
-        'attrs' => array(
-          new BooleanAttribute (
-            _('Display summary in listings'),
-            _('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.'),
-            'fdListSummary', FALSE,
-            TRUE
-          ),
-          new SelectAttribute (
-            _('Edit locking'),
-            _('Check if a entry currently being edited has been modified outside of FusionDirectory in the meantime.'),
-            'fdModificationDetectionAttribute', FALSE,
-            array('', 'entryCSN', 'contextCSN'), 'entryCSN'
-          ),
-          new BooleanAttribute (
-            _('Enable logging'),
-            _('Event logging on FusionDirectory side.'),
-            'fdLogging', FALSE,
-            TRUE
-          ),
-          new IntAttribute (
-            _('LDAP size limit'), _('Defines the number of entries to get from LDAP by default.'),
-            'fdLdapSizeLimit', FALSE,
-            0 /*min*/, FALSE /*no max*/, 200
-          ),
-        )
-      ),
       'login' => array(
         'name'  => _('Login and session'),
         'attrs' => array(
@@ -225,21 +224,6 @@ class configInLdap extends simplePlugin
           ),
         )
       ),
-      'snapshots' => array(
-        'name'  => _('Snapshots'),
-        'attrs' => array(
-          new BooleanAttribute (
-            _('Enable snapshots'), _('This enables you to save certain states of entries and restore them later on.'),
-            'fdEnableSnapshots', FALSE,
-            TRUE
-          ),
-          new StringAttribute (
-            _('Snapshot base'), _('The base where snapshots should be stored inside of the LDAP.'),
-            'fdSnapshotBase', FALSE,
-            'ou=snapshots,'.$config->current['BASE']
-          ),
-        )
-      ),
       'ssl' => array(
         'name'  => _('SSL'),
         'attrs' => array(
@@ -310,28 +294,6 @@ class configInLdap extends simplePlugin
             'fdStrictNamingRules', FALSE,
             TRUE
           ),
-          new IntAttribute (
-            _('Group/user min id'),
-            _('The minimum assignable user or group id to avoid security leaks with id 0 accounts.'),
-            'fdMinId', FALSE,
-            0, FALSE, 100
-          ),
-          new StringAttribute (
-            _('Next id hook'), _('A script to be called for finding the next free id number for users or groups.'),
-            'fdNextIdHook', FALSE
-          ),
-          new IntAttribute (
-            _('Base number for user id'),
-            _('Where to start looking for a new free user id.'),
-            'fdUidNumberBase', FALSE,
-            0, FALSE, 1100
-          ),
-          new IntAttribute (
-            _('Base number for group id'),
-            _('Where to start looking for a new free group id.'),
-            'fdGidNumberBase', FALSE,
-            0, FALSE, 1100
-          ),
           new StringAttribute (
             _('Users RDN'), _('The branch where users are stored.'),
             'fdUserRDN', TRUE,
@@ -347,36 +309,18 @@ class configInLdap extends simplePlugin
             'fdAclRoleRDN', TRUE,
             'ou=aclroles'
           ),
-          new SelectAttribute (
-            _('Id allocation method'), _('Method to allocate user/group ids'),
-            'fdIdAllocationMethod', TRUE,
-            array('traditional', 'pool'), 'traditional',
-            array(_('Traditional'), _('Samba unix id pool'))
-          ),
-          new IntAttribute (
-            _('Pool user id min'), _('Minimum value for user id when using pool method'),
-            'fdUidNumberPoolMin', FALSE,
-            0, FALSE, 10000
-          ),
-          new IntAttribute (
-            _('Pool user id max'), _('Maximum value for user id when using pool method'),
-            'fdUidNumberPoolMax', FALSE,
-            0, FALSE, 40000
-          ),
-          new IntAttribute (
-            _('Pool group id min'), _('Minimum value for group id when using pool method'),
-            'fdGidNumberPoolMin', FALSE,
-            0, FALSE, 10000
-          ),
-          new IntAttribute (
-            _('Pool group id max'), _('Maximum value for group id when using pool method'),
-            'fdGidNumberPoolMax', FALSE,
-            0, FALSE, 40000
-          ),
           new BooleanAttribute (
             _('Restrict role members'), _('When enabled only users from the same branch or members of groups from the same branch can be added to a role.'),
             'fdRestrictRoleMembers'
           ),
+          new BooleanAttribute (
+            _('Separate address fields'), _('Expose street, postOfficeBox and postalCode fields instead of postalAddress.'),
+            'fdSplitPostalAddress'
+          ),
+          new PostalAddressAttribute (
+            _('Postal address pattern'), _('When using separate address fields, you can use a pattern to fill postalAddress field.'),
+            'fdPostalAddressPattern'
+          ),
         )
       ),
       'debug' => array(
@@ -413,6 +357,52 @@ class configInLdap extends simplePlugin
       ),
       'miscellaneous' => array(
         'name'  => _('Miscellaneous'),
+        'attrs' => array(
+          new BooleanAttribute (
+            _('Display summary in listings'),
+            _('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.'),
+            'fdListSummary', FALSE,
+            TRUE
+          ),
+          new BooleanAttribute (
+            _('Show ACL tab on all objects'),
+            _('For very specific ACL rights setting where you might need to give right on a single object.'),
+            'fdAclTabOnObjects'
+          ),
+          new SetAttribute(
+            new StringAttribute (
+              _('Available department categories'), _('Available categories in the departments dropdown'),
+              'fdDepartmentCategories', FALSE
+            ),
+            array()
+          ),
+          new OrderedArrayAttribute(
+            new PipeSeparatedCompositeAttribute(
+              _('Use this to hide some menu entry to specific groups of users'),
+              'fdPluginsMenuBlacklist',
+              array(
+                new SelectAttribute(
+                  '', _('Group or role'),
+                  'blacklistGroup', TRUE,
+                  array()
+                ),
+                new SelectAttribute(
+                  '', _('Plugin to blacklist'),
+                  'blacklistPlugin', TRUE,
+                  array()
+                ),
+              ),
+              '',
+              _('Plugin menu blacklist')
+            ),
+            // no order
+            FALSE,
+            array()
+          )
+        )
+      ),
+      'hooks' => array(
+        'name'  => _('Hooks'),
         'class' => array('fullwidth'),
         'attrs' => array(
           new OrderedArrayAttribute (
@@ -421,18 +411,19 @@ class configInLdap extends simplePlugin
               'fdTabHook',
               array(
                 new SelectAttribute(
-                  _('tab'), _('The tab that this hook concerns'),
+                  _('Tab'), _('The tab that this hook concerns'),
                   'hookTab', TRUE,
                   $plugins
                 ),
                 new SelectAttribute(
-                  _('mode'), _('When to call this command'),
+                  _('Mode'), _('When to call this command'),
                   'hookMode', TRUE,
                   array('postcreate', 'postremove', 'postmodify',
-                        'precreate', 'preremove', 'premodify', 'check')
+                        'precreate', 'preremove', 'premodify', 'check',
+                        'prelock', 'postlock', 'preunlock', 'postunlock')
                 ),
-                new StringAttribute(
-                  _('cmd'), _('The command that will be called'),
+                new TextAreaAttribute(
+                  _('Command'), _('The command that will be called'),
                   'hookCmd', TRUE
                 )
               ),
@@ -450,30 +441,6 @@ class configInLdap extends simplePlugin
             _('When enabled successful hook execution output is displayed to the user using a dialog.'),
             'fdDisplayHookOutput'
           ),
-          new SetAttribute(
-            new StringAttribute (
-              _('Available shells'), _('Available POSIX shells for FD users.'),
-              'fdShells', FALSE
-            ),
-            array('/bin/ash','/bin/bash','/bin/csh','/bin/sh','/bin/ksh',
-                  '/bin/tcsh','/bin/dash','/bin/zsh','/sbin/nologin', '/bin/false', '/usr/bin/git-shell')
-          ),
-          new SelectAttribute (
-            _('Default shell'), _('Shell used by default when activating Unix tab.'),
-            'fdDefaultShell', TRUE
-          ),
-          new BooleanAttribute (
-            _('Show ACL tab on all objects'),
-            _('For very specific ACL rights setting where you might need to give right on a single object.'),
-            'fdAclTabOnObjects'
-          ),
-          new SetAttribute(
-            new StringAttribute (
-              _('Available department categories'), _('Available categories in the departments dropdown'),
-              'fdDepartmentCategories', FALSE
-            ),
-            array()
-          ),
         )
       ),
     );
@@ -481,6 +448,7 @@ class configInLdap extends simplePlugin
 
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE, $attributesInfo = NULL)
   {
+    global $config;
     $attributesInfo = static::getAttributesInfo();
     /* Languages */
     $languages = get_languages(TRUE);
@@ -494,6 +462,42 @@ class configInLdap extends simplePlugin
     $methods = $methods['name'];
     $attributesInfo['password']['attrs'][0]->setChoices($methods);
 
+    $groupsAndRoles = array_merge(
+      array_map(
+        function ($group)
+        {
+          return sprintf(_('Group %s'), $group);
+        },
+        objects::ls('ogroup')
+      ),
+      array_map(
+        function ($role)
+        {
+          return sprintf(_('Role %s'), $role);
+        },
+        objects::ls('role')
+      )
+    );
+    $attributesInfo['miscellaneous']['attrs'][3]->attribute->attributes[0]->setChoices(
+      array_keys($groupsAndRoles),
+      array_values($groupsAndRoles)
+    );
+    $menuPlugins = array();
+    $plist = session::global_get('plist');
+    foreach ($config->data['SECTIONS'] as $section => $section_infos) {
+      foreach ($config->data['MENU'][$section] as $info) {
+        if (isset($info['CLASS'])) {
+          list ($plHeadline, , , ) = $plist->get_infos($info['CLASS']);
+          $menuPlugins[$info['CLASS']] = $plHeadline;
+        }
+      }
+    }
+    asort($menuPlugins);
+    $attributesInfo['miscellaneous']['attrs'][3]->attribute->attributes[1]->setChoices(
+      array_keys($menuPlugins),
+      array_values($menuPlugins)
+    );
+
     try {
       parent::__construct($dn, $object, $parent, $mainTab, $attributesInfo);
     } catch (NonExistingLdapNodeException $e) {
@@ -503,8 +507,6 @@ class configInLdap extends simplePlugin
 
     $this->fusionConfigMd5 = md5_file(CACHE_DIR."/".CLASS_CACHE);
 
-    $this->attributesAccess['fdDefaultShell']->setChoices($this->fdShells);
-
     $this->attributesAccess['fdHttpAuthActivated']->setManagedAttributes(
       array(
         'erase' => array (
@@ -523,6 +525,9 @@ class configInLdap extends simplePlugin
         )
       )
     );
+
+    $this->attributesAccess['fdTabHook']->setLinearRendering(FALSE);
+
     $this->attributesAccess['fdForceSSL']->setManagedAttributes(
       array(
         'disable' => array (
@@ -532,16 +537,6 @@ class configInLdap extends simplePlugin
         )
       )
     );
-    $this->attributesAccess['fdIdAllocationMethod']->setManagedAttributes(
-      array(
-        'erase' => array (
-          'traditional' => array (
-            'fdUidNumberPoolMin','fdUidNumberPoolMax',
-            'fdGidNumberPoolMin','fdGidNumberPoolMax',
-          )
-        )
-      )
-    );
     $this->attributesAccess['fdCasActivated']->setManagedAttributes(
       array(
         'disable' => array (
@@ -563,6 +558,15 @@ class configInLdap extends simplePlugin
         )
       )
     );
+    $this->attributesAccess['fdSplitPostalAddress']->setManagedAttributes(
+      array(
+        'disable' => array (
+          FALSE => array (
+            'fdPostalAddressPattern',
+          )
+        )
+      )
+    );
   }
 
   function compute_dn()
@@ -570,12 +574,6 @@ class configInLdap extends simplePlugin
     return $this->dn;
   }
 
-  function save_object()
-  {
-    parent::save_object();
-    $this->attributesAccess['fdDefaultShell']->setChoices($this->fdShells);
-  }
-
   static function get_themes()
   {
     $themesdir  = '../ihtml/themes/';
diff --git a/plugins/config/class_recoveryConfig.inc b/plugins/config/class_recoveryConfig.inc
index 9492f5011601381876e24cbe2e8c5828d5d5a0d0..6f0ed62212d21588911352ff5cced5fa2b1edc31 100644
--- a/plugins/config/class_recoveryConfig.inc
+++ b/plugins/config/class_recoveryConfig.inc
@@ -133,10 +133,13 @@ class recoveryConfig extends simplePlugin
       $ldap->cd($config->current['BASE']);
       $ldap->create_missing_trees($tokenBranch);
       if (!$ldap->success()) {
-        $display = msgPool::ldaperror($ldap->get_error(),
-                                  $tokenBranch, LDAP_MOD, get_class());
+        msg_dialog::display(
+          _('LDAP error'),
+          msgPool::ldaperror($ldap->get_error(), $tokenBranch, LDAP_MOD, get_class()),
+          LDAP_ERROR
+        );
       }
-      fusiondirectory_log("Created token branch ".$tokenBranch);
+      fusiondirectory_log('Created token branch '.$tokenBranch);
     }
 
     parent::__construct($dn, $object, $parent, $mainTab);
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index d7f72cc320315d81fd6146432a671f4813310a53..2d39f26c4aa1f6c7cc9aa5e8c9a8d50781d34dc8 100644
--- a/plugins/config/tabs_configInLdap.inc
+++ b/plugins/config/tabs_configInLdap.inc
@@ -23,13 +23,15 @@ class tabs_configInLdap extends simpleTabs_noSpecial
   function save ()
   {
     global $config;
-    parent::save();
+    $errors = parent::save();
     /* check_and_reload */
     $config->check_and_reload(TRUE);
     /* reload plist as well as some plInfo might use $config or get_ou */
     session::global_un_set('plist');
     load_plist();
     session::un_set('passwordMethod::get_available_methods');
+
+    return $errors;
   }
 }
 ?>
diff --git a/plugins/generic/welcome/main.inc b/plugins/generic/welcome/main.inc
index 67d68356386743ccc1da30ed62914190e69bc216..23c07774ccbc1d20345f65dcbfa58d0c58c7e7cd 100644
--- a/plugins/generic/welcome/main.inc
+++ b/plugins/generic/welcome/main.inc
@@ -22,7 +22,7 @@
 if (!$cleanup) {
   session::set('plugin_dir', dirname(__FILE__));
   $smarty->assign('iconmenu', $plist->show_iconmenu());
-  $smarty->assign('header', print_header(get_template_path('geticon.php?context=applications&icon=config-welcome&size=48'), sprintf(_('Welcome %s!'), $ui->cn)));
+  $smarty->assign('header', print_header('geticon.php?context=applications&icon=config-welcome&size=48', sprintf(_('Welcome %s!'), $ui->cn)));
   $smarty->assign('year', date('Y'));
   $smarty->assign('revision', FD_VERSION);
 
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 8c5679ffd88789c10e216f08e80cdd84e70f0db6..fed8e9b673f1dae7a4ccef999228c6434d2c2f01 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -128,8 +128,10 @@ class UserPasswordAttribute extends CompositeAttribute
 
   function setValue ($value)
   {
-    if ($this->attributes[0]->isDisabled() || ($value[0] == '')) {
-      $value[0] = $this->attributes[0]->getValue();
+    reset($value);
+    $key = key($value);
+    if ($this->attributes[0]->isDisabled() || ($value[$key] == '')) {
+      $value[$key] = $this->attributes[0]->getValue();
     }
     parent::setValue($value);
     $this->checkIfMethodNeedsPassword();
@@ -301,8 +303,9 @@ class user extends simplePlugin
   // The main function : information about attributes
   static function getAttributesInfo ()
   {
+    global $config;
     $languages = array_merge(array('' => ''), get_languages(TRUE));
-    return array(
+    $attributesInfo = array(
       'perso' => array(
         'name'  => _('Personal information'),
         'icon'  => 'geticon.php?context=types&icon=user&size=16',
@@ -353,7 +356,6 @@ class user extends simplePlugin
             _('Phone'), _('Business phone number'),
             'telephoneNumber', FALSE
           ),
-          /* TODO: mobile attribute */
           new PhoneNumberAttribute (
             _('Mobile'), _('Business mobile number'),
             'mobile', FALSE
@@ -447,6 +449,25 @@ class user extends simplePlugin
         )
       ),
     );
+    if ($config->get_cfg_value('SplitPostalAddress') == 'TRUE') {
+      $attributesInfo['contact']['attrs'][2]->setVisible(FALSE);
+      array_splice($attributesInfo['contact']['attrs'], 3, 0, array(
+        new StringAttribute (
+          _('Street'), _('Street part of the address'),
+          'street', FALSE
+        ),
+        new StringAttribute (
+          _('Post office box'), _('Post office box'),
+          'postOfficeBox', FALSE
+        ),
+        new IntAttribute (
+          _('Postal code'), _('Postal code'),
+          'postalCode', FALSE,
+          0, FALSE
+        ),
+      ));
+    }
+    return $attributesInfo;
   }
 
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
@@ -470,8 +491,9 @@ class user extends simplePlugin
     return (isset($attrs['objectClass']) && in_array_ics('inetOrgPerson', $attrs['objectClass']));
   }
 
-  function postCopyHook()
+  function resetCopyInfos()
   {
+    parent::resetCopyInfos();
     $this->attributesAccess['uid']->setDisabled($this->initially_was_account && !$this->is_template);
   }
 
@@ -479,7 +501,12 @@ class user extends simplePlugin
   {
     global $config;
     $pattern  = $config->get_cfg_value('CnPattern', '%givenName% %sn%');
-    $fields   = plugin::tpl_list_fields($pattern);
+    $this->attributesAccess['cn']->setValue($this->applyPattern($pattern));
+  }
+
+  private function applyPattern ($pattern)
+  {
+    $fields   = templateHandling::listFields($pattern);
     $attrs    = array();
     foreach ($fields as $field) {
       if (in_array($field, $this->attributes)) {
@@ -497,7 +524,8 @@ class user extends simplePlugin
       }
       trigger_error('Could not find field '.$field.' in any tab!');
     }
-    $this->attributesAccess['cn']->setValue(plugin::tpl_parse_string($pattern, $attrs));
+
+    return templateHandling::parseString($pattern, $attrs);
   }
 
   function compute_dn()
@@ -521,28 +549,48 @@ class user extends simplePlugin
     return parent::execute();
   }
 
-  function ldap_save($cleanup = TRUE)
+  protected function prepare_save ()
   {
-    parent::ldap_save($cleanup);
+    global $config;
+    if ($config->get_cfg_value('SplitPostalAddress') == 'TRUE') {
+      $pattern = $config->get_cfg_value('PostalAddressPattern', '');
+      if (!empty($pattern)) {
+        $this->postalAddress = $this->applyPattern($this->attributesAccess['postalAddress']->inputValue($pattern));
+      }
+    }
+
+    return parent::prepare_save();
+  }
+
+  function ldap_save()
+  {
+    $errors = parent::ldap_save();
+
+    if (!empty($errors)) {
+      return $errors;
+    }
 
     if (!$this->is_template && $this->was_locked && $this->attributesAccess['userPassword']->hasChanged()) {
       $methods  = passwordMethod::get_available_methods();
       $pmethod  = new $methods[$this->attributesAccess['userPassword']->getMethod()]($this->dn);
       $pmethod->lock_account($this->dn);
     }
+
+    return $errors;
   }
 
-  function save()
+  function post_save()
   {
-    parent::save();
+    global $ui;
 
     /* Update current locale settings, if we have edited ourselves */
-    $ui = session::get('ui');
     if (isset($this->attrs['preferredLanguage']) && ($this->dn == $ui->dn)) {
       $ui->language = $this->preferredLanguage;
       session::set('ui', $ui);
       session::set('Last_init_lang', 'update');
     }
+
+    return parent::post_save();
   }
 
   function adapt_from_template($attrs, $skip = array())
@@ -569,7 +617,7 @@ class user extends simplePlugin
     }
   }
 
-  function callHook($cmd, $addAttrs = array(), &$returnOutput = array(), &$returnCode = NULL)
+  function callHook($cmd, array $addAttrs = array(), &$returnOutput = array(), &$returnCode = NULL)
   {
     $addAttrs['passwordMethod'] = $this->attributesAccess['userPassword']->getMethod();
     $addAttrs['userLocked']     = $this->attributesAccess['userPassword']->isLocked();
@@ -660,7 +708,7 @@ class user extends simplePlugin
     } elseif ($check_differ && (substr($current_password, 0, $differ) == substr($new_password, 0, $differ))) {
       return _('The password used as new and current are too similar.');
     } elseif ($check_length && (strlen($new_password) < $length)) {
-      return _('The password used as new is to short.');
+      return _('The password used as new is too short.');
     } elseif (!passwordMethod::is_harmless($new_password)) {
       return _('The password contains possibly problematic Unicode characters!');
     }
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
deleted file mode 100644
index e4afb7e54190ab98c0a8c069bfae2ad592d5dec3..0000000000000000000000000000000000000000
--- a/plugins/personal/posix/class_posixAccount.inc
+++ /dev/null
@@ -1,722 +0,0 @@
-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2016  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   posixAccount plugin
-  \author  Cajus Pollmeier <pollmeier@gonicus.de>
-  \version 2.00
-  \date    24.07.2003
-
-  This class provides the functionality to read and write all attributes
-  relevant for posixAccounts and shadowAccounts from/to the LDAP. It
-  does syntax checking and displays the formulars required.
- */
-
-class EpochDaysDateAttribute extends DateAttribute
-{
-  public static $secondsPerDay = 86400;
-
-  function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $acl = "")
-  {
-    parent::__construct($label, $description, $ldapName, $required, '', $defaultValue, $acl);
-  }
-
-  protected function ldapToDate($ldapValue)
-  {
-    $date = DateTime::createFromFormat('U', $ldapValue * static::$secondsPerDay, timezone::utc());
-    if ($date !== FALSE) {
-      return $date;
-    } else {
-      trigger_error('LDAP value for '.$this->getLdapName().' was not in the right date format.');
-      return new DateTime($ldapValue, timezone::utc());
-    }
-  }
-
-  protected function dateToLdap($dateValue)
-  {
-    return floor($dateValue->format('U') / static::$secondsPerDay);
-  }
-
-  function getEpochDays()
-  {
-    if (empty($this->value)) {
-      return 0;
-    } else {
-      try {
-        return $this->dateToLdap($this->getDateValue());
-      } catch (Exception $e) {
-        if (is_object($this->plugin) && $this->plugin->is_template) {
-          return $this->value;
-        } else {
-          throw $e;
-        }
-      }
-    }
-  }
-}
-
-class posixAccount extends simplePlugin
-{
-  var $displayHeader = TRUE;
-  var $objectclasses = array('posixAccount', 'shadowAccount');
-
-  static function plInfo()
-  {
-    return array(
-      'plShortName'   => _('Unix'),
-      'plDescription' => _('Edit users POSIX settings'),
-      'plIcon'        => 'geticon.php?context=applications&icon=os-linux&size=48',
-      'plSmallIcon'   => 'geticon.php?context=applications&icon=os-linux&size=16',
-      'plSelfModify'  => TRUE,
-      'plPriority'    => 2,
-      'plObjectType'  => array('user'),
-      'plForeignKeys' => array(
-        'gidNumber' => array(
-          array('group','gidNumber'),
-          array('mixedGroup','gidNumber'),
-        ),
-        'host'      => array(
-          array('serverGeneric', 'cn'),
-          array('workstationGeneric', 'cn'),
-          array('terminalGeneric', 'cn'),
-        )
-      ),
-
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
-    );
-  }
-
-  // The main function : information about attributes
-  static function getAttributesInfo ()
-  {
-    global $config;
-    return array(
-      'main' => array(
-        'name'  => _('Unix'),
-        'icon'  => 'geticon.php?context=applications&icon=os-linux&size=16',
-        'attrs' => array(
-          new PathAttribute(
-            _('Home directory'), _('The path to the home directory of this user'),
-            'homeDirectory', TRUE
-          ),
-          new StringAttribute('gecos', 'gecos', 'gecos'),
-          new SelectAttribute(
-            _('Shell'), _('Which shell should be used when this user log in'),
-            'loginShell', TRUE,
-            $config->get_cfg_value('Shells', array(_('unconfigured'))),
-            $config->get_cfg_value('DefaultShell', '')
-          ),
-          new SelectAttribute(
-            _('Primary group'), _('Primary group for this user'),
-            'primaryGroup', FALSE
-          ),
-          new DisplayAttribute(
-            _('Status'), _('Status of this user unix account'),
-            'posixStatus', FALSE
-          ),
-          new BooleanAttribute(
-            _('Force user/group id'), _('Force user id and group id values for this user'),
-            'force_ids', FALSE
-          ),
-          new IntAttribute(
-            _('User id'), _('User id value for this user'),
-            'uidNumber', FALSE,
-            0, FALSE, ''
-          ),
-          new IntAttribute(
-            _('Group id'), _('Group id value for this user'),
-            'gidNumber', FALSE,
-            0, FALSE, ''
-          )
-        )
-      ),
-      'groups' => array(
-        'name'  => _('Group membership'),
-        'icon'  => 'geticon.php?context=types&icon=user-group&size=16',
-        'attrs' => array(
-          new GroupsAttribute('', _('Group membership'), 'groupMembership')
-        )
-      ),
-      'account' => array(
-        'name'  => _('Account'),
-        'icon'  => 'geticon.php?context=devices&icon=terminal&size=16',
-        'attrs' => array(
-          new BooleanAttribute(
-            _('User must change password on first login'), _('User must change password on first login (needs a value for Delay before forcing password change)'),
-            'mustchangepassword', FALSE
-          ),
-          new IntAttribute(
-            _('Minimum delay between password changes (days)'), _('The user won\'t be able to change his password before this number of days (leave empty to disable)'),
-            'shadowMin', FALSE,
-            0, FALSE, ''
-          ),
-          new IntAttribute(
-            _('Delay before forcing password change (days)'), _('The user will be forced to change his password after this number of days (leave empty to disable)'),
-            'shadowMax', FALSE,
-            0, FALSE, ''
-          ),
-          new EpochDaysDateAttribute(
-            _('Password expiration date'), _('Date after which this user password will expire (leave empty to disable)'),
-            'shadowExpire', FALSE,
-            ''
-          ),
-          new IntAttribute(
-            _('Delay of inactivity before disabling user (days)'), _('Maximum delay of inactivity after password expiration before the user is disabled (leave empty to disable)'),
-            'shadowInactive', FALSE,
-            0, FALSE, ''
-          ),
-          new IntAttribute(
-            _('Delay for user warning before password expiry (days)'), _('The user will be warned this number of days before his password expiration (leave empty to disable)'),
-            'shadowWarning', FALSE,
-            0, FALSE, ''
-          ),
-          new IntAttribute(
-            'No label', 'No description',
-            'shadowLastChange', FALSE,
-            0, FALSE, ''
-          ),
-        )
-      ),
-      'system_trust' => array(
-        'name'  => _('System trust'),
-        'icon'  => 'geticon.php?context=categories&icon=acl&size=16',
-        'attrs' => array(
-          new SelectAttribute(
-            _('Trust mode'), _('Type of authorization for those hosts'),
-            'trustMode', FALSE,
-            array('', 'fullaccess', 'byhost'),
-            '',
-            array(_('disabled'), _('full access'), _('allow access to these hosts'))
-          ),
-          new SystemsAttribute(
-            '', _('Only allow this user to connect to this list of hosts'),
-            'host', FALSE
-          )
-        )
-      )
-    );
-  }
-
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
-  {
-    global $config;
-    parent::__construct($dn, $object, $parent, $mainTab);
-
-    $this->attributesAccess['gecos']->setVisible(FALSE);
-
-    $this->attributesAccess['trustMode']->setInLdap(FALSE);
-    if (!class_available('systemManagement')) {
-      $this->attributesAccess['trustMode']->setChoices(
-            array('', 'fullaccess'),
-            array(_('disabled'), _('full access'))
-      );
-    }
-    $this->attributesAccess['trustMode']->setManagedAttributes(
-      array(
-        'multiplevalues' => array('notbyhost' => array('','fullaccess')),
-        'erase' => array(
-          'notbyhost' => array('host')
-        )
-      )
-    );
-    if ((count($this->host) == 1) && ($this->host[0] == '*')) {
-      $this->trustMode = 'fullaccess';
-    } elseif (count($this->host) > 0) {
-      $this->trustMode = 'byhost';
-    }
-
-    $this->attributesAccess['uidNumber']->setUnique(TRUE);
-    $this->attributesAccess['force_ids']->setInLdap(FALSE);
-    $this->attributesAccess['force_ids']->setManagedAttributes(
-      array(
-        'disable' => array (
-          FALSE => array (
-            'uidNumber',
-            'gidNumber',
-          )
-        )
-      )
-    );
-    $this->attributesAccess['primaryGroup']->setInLdap(FALSE);
-
-    $this->attributesAccess['mustchangepassword']->setInLdap(FALSE);
-    $this->attributesAccess['shadowLastChange']->setVisible(FALSE);
-    $this->attributesAccess['shadowMax']->setManagedAttributes(
-      array(
-        'disable' => array (
-          '' => array (
-            'mustchangepassword',
-          )
-        )
-      )
-    );
-
-    if ($dn !== NULL) {
-      /* Correct is_account. shadowAccount is not required. */
-      if (isset($this->attrs['objectClass']) &&
-          in_array ('posixAccount', $this->attrs['objectClass'])) {
-        $this->is_account = TRUE;
-      }
-
-      $this->initially_was_account = $this->is_account;
-
-      // Templates do not have a gidNumber
-      if ($this->gidNumber == 2147483647) {
-        $this->gidNumber = "";
-      }
-
-      /* Fill group */
-      $this->primaryGroup = $this->gidNumber;
-    }
-
-    /* Generate shell list from config */
-    $loginShellList = $this->attributesAccess['loginShell']->getChoices();
-
-    /* Insert possibly missing loginShell */
-    $loginShell = $this->attributesAccess['loginShell']->getValue();
-    if (($loginShell != '') && !in_array($loginShell, $loginShellList)) {
-      $loginShellList[] = $loginShell;
-    }
-    $this->attributesAccess['loginShell']->setChoices($loginShellList);
-
-    $secondaryGroups = array();
-    $secondaryGroups[''] = "- "._("automatic")." -";
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search("(objectClass=posixGroup)", array("cn", "gidNumber"));
-    while ($attrs = $ldap->fetch()) {
-      $secondaryGroups[$attrs['gidNumber'][0]] = $attrs['cn'][0];
-    }
-    asort ($secondaryGroups);
-    $this->attributesAccess['primaryGroup']->setChoices(array_keys($secondaryGroups), array_values($secondaryGroups));
-
-    if (!$this->is_template) {
-      $current = floor(date("U") / EpochDaysDateAttribute::$secondsPerDay);
-
-      $shadowExpire     = $this->attributesAccess['shadowExpire']->getEpochDays();
-      $shadowInactive   = $this->attributesAccess['shadowInactive']->getValue();
-      $shadowMin        = $this->attributesAccess['shadowMin']->getValue();
-      $shadowMax        = $this->attributesAccess['shadowMax']->getValue();
-      $shadowLastChange = $this->attributesAccess['shadowLastChange']->getValue();
-      if (($current >= $shadowExpire) && ($shadowExpire > 0)) {
-        $status = _("expired");
-        if ($shadowInactive != "" && ($current - $shadowExpire) < $shadowInactive) {
-          $status .= ", "._("grace time active");
-        }
-      } elseif ($shadowMax != "" && ($shadowLastChange + $shadowMax) <= $current) {
-        $status = _("active").", "._("password expired");
-      } elseif ($shadowMin != "" && ($shadowLastChange + $shadowMin) <= $current) {
-        $status = _("active").", "._("password not changeable");
-      } else {
-        $status = _("active");
-      }
-      $this->attributesAccess['posixStatus']->setValue($status);
-    }
-
-    $this->attributesAccess['groupMembership']->setInLdap(FALSE);
-    if (class_available('mixedGroup')) {
-      $this->attributesAccess['groupMembership']->setDisabled(TRUE);
-      $this->attributesAccess['groupMembership']->setVisible(FALSE);
-    } else {
-      if ($this->is_template) {
-        if (isset($this->attrs['posixGroups'])) {
-          unset($this->attrs['posixGroups']['count']);
-          $this->groupMembership = $this->attrs['posixGroups'];
-        }
-      } else {
-        /* Groups handling */
-        $ldap->cd($config->current['BASE']);
-        $ldap->search('(&(objectClass=posixGroup)(memberUid='.ldap_escape_f($this->getUid()).'))', array('cn', 'description'));
-        $groupMembership = array();
-        while ($attrs = $ldap->fetch()) {
-          if (!isset($attrs['description'][0])) {
-            $entry = $attrs['cn'][0];
-          } else {
-            $entry = $attrs['cn'][0].' ['.$attrs['description'][0].']';
-          }
-          $groupMembership[$attrs['dn']] = $entry;
-        }
-        asort($groupMembership);
-        reset($groupMembership);
-        $this->attributesAccess['groupMembership']->setValue(array_keys($groupMembership));
-        $this->attributesAccess['groupMembership']->setDisplayValues(array_values($groupMembership));
-        $this->savedGroupMembership = array_keys($groupMembership);
-      }
-    }
-    if ($this->is_template) {
-      if (isset($this->attrs['force_ids'])) {
-        $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
-      }
-      if (isset($this->attrs['mustchangepassword'])) {
-        $this->mustchangepassword = ($this->attrs['mustchangepassword'][0] != 'FALSE');
-      }
-    }
-  }
-
-  function getUid()
-  {
-    if (isset($this->parent)) {
-      $baseobject = $this->parent->getBaseObject();
-      return $baseobject->uid;
-    }
-    if (isset($this->attrs['uid'][0])) {
-      return $this->attrs['uid'][0];
-    }
-  }
-
-  function resetCopyInfos()
-  {
-    global $config;
-    parent::resetCopyInfos();
-
-    $this->savedGroupMembership = array();
-
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).')(cn='.ldap_escape_f($this->getUid()).'))', array('cn','gidNumber'));
-
-    if ($ldap->count() > 0) {
-      /* The copied user had its own group */
-      /* switch back to automatic */
-      $this->primaryGroup = 0;
-    }
-
-    $this->force_ids = FALSE;
-    $this->attributesAccess['uidNumber']->setInitialValue('');
-    $this->attributesAccess['gidNumber']->setInitialValue('');
-    $this->uidNumber = '';
-    $this->gidNumber = '';
-  }
-
-  function check()
-  {
-    global $config;
-    if (isset($this->parent) &&
-        isset($this->parent->getBaseObject()->is_template) &&
-        $this->parent->getBaseObject()->is_template) {
-      $message = array();
-    } else {
-      $message = parent::check();
-    }
-
-    /* Check ID's if they are forced by user */
-    if ($this->force_ids) {
-      if ($this->uidNumber < $config->get_cfg_value("minId")) {
-        $message[] = msgPool::toosmall(_("UID"), $config->get_cfg_value("minId"));
-      }
-      if ($this->gidNumber < $config->get_cfg_value("minId")) {
-        $message[] = msgPool::toosmall(_("GID"), $config->get_cfg_value("minId"));
-      }
-    }
-
-    /* Check shadow settings */
-    if ($this->shadowWarning !== "") {
-      if ($this->shadowMax === "") {
-        $message[] = msgPool::depends("shadowWarning", "shadowMax");
-      }
-      if ($this->shadowWarning > $this->shadowMax) {
-        $message[] = msgPool::toobig("shadowWarning", "shadowMax");
-      }
-      if (($this->shadowMin !== "") && ($this->shadowWarning < $this->shadowMin)) {
-        $message[] = msgPool::toosmall("shadowWarning", "shadowMin");
-      }
-    }
-
-    if (($this->shadowInactive !== "") && ($this->shadowMax === "")) {
-      $message[] = msgPool::depends("shadowInactive", "shadowMax");
-    }
-    if (($this->shadowMin !== "") && ($this->shadowMax !== "") &&
-        ($this->shadowMin > $this->shadowMax)) {
-      $message[] = msgPool::toobig("shadowMin", "shadowMax");
-    }
-
-    return $message;
-  }
-
-  function prepare_save()
-  {
-    global $config;
-    /* Fill gecos */
-    if (isset($this->parent) && $this->parent !== NULL) {
-      $this->gecos = rewrite($this->parent->getBaseObject()->cn);
-      if (!preg_match('/^[a-z0-9 -]+$/i', $this->gecos)) {
-        $this->gecos = "";
-      }
-    }
-
-    if (!$this->force_ids) {
-      /* Handle uidNumber.
-       * - use existing number if possible
-       * - if not, try to create a new uniqe one.
-       * */
-      if ($this->attributesAccess['uidNumber']->getInitialValue() != "") {
-        $this->uidNumber = $this->attributesAccess['uidNumber']->getInitialValue();
-      } else {
-        /* Calculate new id's. We need to place a lock before calling get_next_id
-           to get real unique values.
-         */
-        $wait = 10;
-        while (get_lock("uidnumber") != "") {
-          sleep (1);
-
-          /* Oups - timed out */
-          if ($wait-- == 0) {
-            msg_dialog::display(_("Warning"), _("Timeout while waiting for lock. Ignoring lock!"), WARNING_DIALOG);
-            break;
-          }
-        }
-        add_lock ("uidnumber", "gosa");
-        $this->uidNumber = get_next_id("uidNumber", $this->dn);
-      }
-    }
-
-    /* Handle gidNumber
-     * - If we do not have a primary group selected (automatic), we will check if there
-     *    is already a group  with the same name and use this as primary.
-     * - .. if we couldn't find a group with the same name, we will create a new one,
-     *    using the users uid as cn and a generated uniqe gidNumber.
-     * */
-    if ($this->is_template && $this->force_ids) {
-      /* Nothing to do in this case */
-    } elseif ($this->is_template && ($this->primaryGroup == 0)) {
-      $this->gidNumber = 2147483647;
-    } elseif (($this->primaryGroup == 0) || $this->force_ids) {
-      /* Search for existing group */
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-
-      /* Are we forced to use a special gidNumber? */
-      if ($this->force_ids) {
-        $ldap->search('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).'))',      array('cn','gidNumber'));
-      } else {
-        $ldap->search('(&(objectClass=posixGroup)(gidNumber=*)(cn='.ldap_escape_f($this->getUid()).'))', array('cn','gidNumber'));
-      }
-
-      /* No primary group found, create a new one */
-      if ($ldap->count() == 0) {
-        $groupcn  = $this->getUid();
-
-        /* Request a new and unique gidNumber, if required */
-        if (!$this->force_ids) {
-          $this->gidNumber = get_next_id('gidNumber', $this->dn);
-        }
-
-        /* If forced gidNumber could not be found, then check if the given group name already exists.
-         */
-        $cnt = 0;
-        $ldap->search('(&(objectClass=posixGroup)(cn='.ldap_escape_f($groupcn).'))', array('cn'));
-        while ($ldap->count() && ($cnt < 100)) {
-          $cnt++;
-          $groupcn = $this->getUid().'_'.$cnt;
-          $ldap->search('(&(objectClass=posixGroup)(cn='.ldap_escape_f($groupcn).'))', array('cn'));
-        }
-
-        /* Create new primary group and enforce the new gidNumber */
-        if (class_available('mixedGroup')) {
-          $tabObject = objects::create('ogroup');
-        } else {
-          $tabObject  = objects::create('group');
-        }
-
-        $baseObject = $tabObject->getBaseObject();
-
-        $baseObject->cn           = $groupcn;
-        $baseObject->description  = sprintf(_('Group of user %s'), $this->getUid());
-        if (class_available('mixedGroup')) {
-          // fake attrs as this user may not exists yet
-          $attrs = array(
-            'objectClass' => array('inetOrgPerson','organizationalPerson','person','posixAccount','shadowAccount'),
-            'cn' => $this->getUid(),
-            'uid' => $this->getUid(),
-          );
-          $baseObject->attributesAccess['member']->addValue($this->dn, $attrs);
-          $tabObject->gen_tabs();
-          $posixTab = $tabObject->by_object['mixedGroup'];
-        } else {
-          $posixTab = $baseObject;
-        }
-        $posixTab->force_id   = 1;
-        $posixTab->gidNumber  = $this->gidNumber;
-
-        $tabObject->save();
-        $groupdn = $tabObject->dn;
-
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
-          sprintf('Primary group "%s" created, using gidNumber "%s".', $groupdn, $this->gidNumber), '');
-      } else {
-        $attrs = $ldap->fetch();
-        $this->gidNumber = $attrs['gidNumber'][0];
-        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
-          "Found and used: <i>".$attrs['dn']."</i>",
-          sprintf("Primary group '%s' exists, gidNumber is '%s'.", $this->getUid(), $this->gidNumber));
-      }
-    } else {
-      /* Primary group was selected by user */
-      $this->gidNumber = $this->primaryGroup;
-      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
-        sprintf("Primary group '%s' for user '%s' manually selected.",
-        $this->gidNumber, $this->getUid()), "");
-    }
-
-    if (!$this->is_template) {
-      if ($this->mustchangepassword) {
-        $this->shadowLastChange =
-          floor(date('U') / EpochDaysDateAttribute::$secondsPerDay) - $this->shadowMax - 1;
-      } elseif (
-          ($this->is_account && !$this->initially_was_account) ||
-          $this->parent->getBaseObject()->attributesAccess['userPassword']->hasChanged()
-        ) {
-        $this->shadowLastChange = floor(date('U') / EpochDaysDateAttribute::$secondsPerDay);
-      }
-    }
-
-    $this->updateAttributesValues();
-    parent::prepare_save();
-
-    if ($this->trustMode == 'fullaccess') {
-      $this->attrs['host'] = array('*');
-    }
-
-    /* Trust accounts */
-    if (($this->trustMode != "") && !in_array('hostObject', $this->attrs['objectClass'])) {
-      $this->attrs['objectClass'][] = 'hostObject';
-    } elseif (($this->trustMode == "") && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
-      unset($this->attrs['objectClass'][$key]);
-    }
-
-    if ($this->is_template) {
-      $this->attrs['posixGroups'] = $this->groupMembership;
-      if ($this->force_ids) {
-        if (($this->uidNumber == '%askme%') ||($this->gidNumber == '%askme%')) {
-          $this->attrs['force_ids'] = '%askme%';
-        } else {
-          $this->attrs['force_ids'] = 'TRUE';
-        }
-      } else {
-        $this->attrs['force_ids']   = 'FALSE';
-      }
-      $this->attrs['mustchangepassword'] = ($this->mustchangepassword ? 'TRUE' : 'FALSE');
-    }
-  }
-
-  function save()
-  {
-    parent::save();
-    del_lock("uidnumber");
-
-    if (!$this->is_template && !class_available('mixedGroup')) {
-      /* Take care about groupMembership values: add to groups */
-      $groupMembership = $this->attributesAccess['groupMembership']->getValue();
-      foreach ($groupMembership as $value) {
-        if (!in_array($value, $this->savedGroupMembership)) {
-          $g = objects::open($value, 'group');
-          $g->by_object['group']->addUser($this->dn, $this->getUid());
-          $g->save();
-        }
-      }
-
-      /* Remove groups not listed in groupMembership */
-      foreach ($this->savedGroupMembership as $value) {
-        if (!in_array($value, $groupMembership)) {
-          $g = objects::open($value, 'group');
-          $g->by_object['group']->removeUser($this->getUid());
-          $g->save();
-        }
-      }
-    }
-  }
-
-  /* remove object from parent */
-  function remove_from_parent()
-  {
-    global $config;
-    /* Cancel if there's nothing to do here */
-    if ((!$this->initially_was_account) || (!$this->acl_is_removeable())) {
-      return;
-    }
-
-    /* Remove and write to LDAP */
-    parent::remove_from_parent();
-
-    /* Delete group only if cn is uid and there are no other members inside */
-    $ldap = $config->get_ldap_link();
-    $ldap->cd ($config->current['BASE']);
-    $ldap->search ('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).')(cn='.ldap_escape_f($this->getUid()).'))', array('cn', 'memberUid'));
-    if ($ldap->count() != 0) {
-      $attrs = $ldap->fetch();
-      if ($attrs['cn'][0] == $this->getUid() && !isset($this->attrs['memberUid'])) {
-        $ldap->rmDir($attrs['dn']);
-      }
-    }
-  }
-
-  /* Adapt from template, using 'dn' */
-  function adapt_from_template($attrs, $skip = array())
-  {
-    /* Include global link_info */
-
-    parent::adapt_from_template($attrs, $skip);
-
-    $this->savedGroupMembership = $this->groupMembership;
-    if (isset($this->attrs['posixGroups'])) {
-      unset($this->attrs['posixGroups']['count']);
-      $this->groupMembership = $this->attrs['posixGroups'];
-    }
-
-    if (isset($this->attrs['force_ids'])) {
-      $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
-    }
-
-    if (isset($this->attrs['mustchangepassword'])) {
-      $this->mustchangepassword = ($this->attrs['mustchangepassword'][0] != 'FALSE');
-    }
-
-    $this->attributesAccess['uidNumber']->setInitialValue('');
-
-    /* Fix primary group settings */
-    if ($this->gidNumber == 2147483647) {
-      $this->gidNumber = "";
-    }
-
-    $this->primaryGroup = $this->gidNumber;
-
-    if ((count($this->host) == 1) && ($this->host[0] == '*')) {
-      $this->trustMode = 'fullaccess';
-    } elseif (count($this->host) > 0) {
-      $this->trustMode = 'byhost';
-    }
-  }
-
-  function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
-  {
-    $ret = parent::foreignKeyUpdate($field, $oldvalue, $newvalue, $source);
-    if ($field == 'gidNumber') {
-      if ($newvalue === NULL) {
-        $this->primaryGroup = 0;
-      } else {
-        $this->primaryGroup = $this->gidNumber;
-      }
-    }
-    return $ret;
-  }
-}
-
-?>
diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc
deleted file mode 100644
index ec9bacffaaac6c237e8369e00d9b24a0cf53c255..0000000000000000000000000000000000000000
--- a/plugins/personal/posix/main.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  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.
-*/
-
-posixAccount::mainInc('posixAccount', $ui->dn);
-?>
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index b74f49813540d989496d175d33dbca0080759edb..92cf1c4996587af8ae431817768da1a91ffb6f01 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -149,8 +149,6 @@ class userRoles extends simplePlugin
 
     $this->is_account = ((count($this->rolesMembership) > 0) || (count($this->groupsMembership) > 0));
     $this->initially_was_account = $this->is_account;
-
-    $this->updateAttributesValues();
   }
 
   function is_this_account($attrs)
@@ -169,7 +167,9 @@ class userRoles extends simplePlugin
 
   function remove_from_parent()
   {
-    if (!$this->is_template && ($this->dn != '') && ($this->dn != 'new')) {
+    if ($this->is_template) {
+      parent::remove_from_parent();
+    } elseif (($this->dn != '') && ($this->dn != 'new')) {
       /* Remove all groups */
       foreach ($this->savedGroupsMembership as $ogroupdn) {
         $g = objects::open($ogroupdn, 'ogroup');
@@ -191,6 +191,20 @@ class userRoles extends simplePlugin
     $this->is_account = ((count($this->rolesMembership) > 0) || (count($this->groupsMembership) > 0));
   }
 
+  protected function shouldSave()
+  {
+    if (parent::shouldSave()) {
+      return TRUE;
+    }
+    if (array_differs($this->groupsMembership, $this->savedGroupsMembership)) {
+      return TRUE;
+    }
+    if (array_differs($this->rolesMembership, $this->savedRolesMembership)) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
   function prepare_save()
   {
     parent::prepare_save();
@@ -200,20 +214,32 @@ class userRoles extends simplePlugin
     }
   }
 
-  function ldap_save($cleanup = TRUE)
+  function prepare_remove()
   {
-    parent::ldap_save($cleanup);
+    parent::prepare_remove();
+    if ($this->is_template) {
+      $this->attrs['userGroups']  = array();
+      $this->attrs['userRoles']   = array();
+    }
+  }
+
+  function ldap_save()
+  {
+    $errors = parent::ldap_save();
+
+    if (!empty($errors)) {
+      return $errors;
+    }
 
     if (!$this->is_template) {
       /* We need to give an array which looks like an ldap fetch and match user filter */
       $fake_attrs = array(
         'objectClass' => array('inetOrgPerson','organizationalPerson','person'),
         'cn'          => array($this->dn),
+        'uid'         => array($this->dn),
         'dn'          => $this->dn
       );
 
-      $errors = array();
-
       /* Take care about groupsMembership values: add to groups */
       $groupsMembership = $this->attributesAccess['groupsMembership']->getValue();
       foreach ($groupsMembership as $ogroupdn) {
@@ -224,12 +250,17 @@ class userRoles extends simplePlugin
             continue;
           }
           $g->getBaseObject()->attributesAccess['member']->addValue($this->dn, $fake_attrs);
-          $g->save();
+          $msg = $g->save();
+          if (empty($msg)) {
+            $this->savedGroupsMembership[] = $ogroupdn;
+          } else {
+            $errors = array_merge($errors, $msg);
+          }
         }
       }
 
       /* Remove groups not listed in groupsMembership */
-      foreach ($this->savedGroupsMembership as $ogroupdn) {
+      foreach ($this->savedGroupsMembership as $key => $ogroupdn) {
         if (!in_array($ogroupdn, $groupsMembership)) {
           $g = objects::open($ogroupdn, 'ogroup');
           if (!$g->getBaseObject()->attrIsWriteable('member')) {
@@ -237,7 +268,12 @@ class userRoles extends simplePlugin
             continue;
           }
           $g->getBaseObject()->attributesAccess['member']->searchAndRemove($this->dn);
-          $g->save();
+          $msg = $g->save();
+          if (empty($msg)) {
+            unset($this->savedGroupsMembership[$key]);
+          } else {
+            $errors = array_merge($errors, $msg);
+          }
         }
       }
 
@@ -251,12 +287,17 @@ class userRoles extends simplePlugin
             continue;
           }
           $r->getBaseObject()->attributesAccess['roleOccupant']->addValue($this->dn, $fake_attrs);
-          $r->save();
+          $msg = $r->save();
+          if (empty($msg)) {
+            $this->savedRolesMembership[] = $roledn;
+          } else {
+            $errors = array_merge($errors, $msg);
+          }
         }
       }
 
       /* Remove roles not listed in rolesMembership */
-      foreach ($this->savedRolesMembership as $roledn) {
+      foreach ($this->savedRolesMembership as $key => $roledn) {
         if (!in_array($roledn, $rolesMembership)) {
           $r = objects::open($roledn, 'role');
           if (!$r->getBaseObject()->attrIsWriteable('roleOccupant')) {
@@ -264,13 +305,17 @@ class userRoles extends simplePlugin
             continue;
           }
           $r->getBaseObject()->attributesAccess['roleOccupant']->searchAndRemove($this->dn);
-          $r->save();
+          $msg = $r->save();
+          if (empty($msg)) {
+            unset($this->savedRolesMembership[$key]);
+          } else {
+            $errors = array_merge($errors, $msg);
+          }
         }
       }
-
-      /* Display errors if any */
-      msg_dialog::displayChecks($errors);
     }
+
+    return $errors;
   }
 
   function adapt_from_template($attrs, $skip = array())
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index c2889f118870e13de5092a198c5be4c67c678238..10f15707a4f6b9691d11c829ae459f701cc7db38 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -42,10 +42,13 @@ class setup
 {
   /* Number of setup steps */
   var $i_steps;
+
   /* Current step */
   var $i_current        = 0;
-  /* Previous setup step; */
+
+  /* Previous setup step */
   var $i_previous       = 0;
+
   var $i_config         = 4;
   var $o_steps          = array();
   var $captured_values  = array();
@@ -53,13 +56,13 @@ class setup
   function __construct()
   {
     $this->o_steps = array(
-      new Step_Welcome($this),
-      new Step_Language($this),
-      new Step_Checks($this),
-      new Step_Ldap($this),
-      new Step_Config_before_init($this),
-      new Step_Migrate($this),
-      new Step_Finish($this),
+      new setupStepWelcome($this),
+      new setupStepLanguage($this),
+      new setupStepChecks($this),
+      new setupStepLdap($this),
+      new setupStepConfig_before_init($this),
+      new setupStepMigrate($this),
+      new setupStepFinish($this),
     );
 
     $this->i_steps = count($this->o_steps);
@@ -76,9 +79,9 @@ class setup
   {
     /* Display phpinfo() dialog when $_GET['info'] is set,
      *  but only do this, if user is allowed to use the setup.
-     * If setupStep_Welcome is_completed, we are allowed to view those infos-
+     * If setupsetupStepWelcome is_completed, we are allowed to view those infos-
      */
-    if (isset($_GET['info']) && preg_match("/Step_Welcome/i", get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()) {
+    if (isset($_GET['info']) && preg_match("/setupStepWelcome/i", get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()) {
       phpinfo();
       exit();
     }
@@ -235,7 +238,7 @@ class setup
     /* Skip adding forward/backward button,
      *  if the currently opened step is a sub dialog
      */
-    if ($this->o_steps[$this->i_current]->dialog) {
+    if ($this->o_steps[$this->i_current]->is_modal_dialog()) {
       $str = '';
     } else {
       $str = '   <p class="plugbottom">';
@@ -316,7 +319,7 @@ class setup
 
   function reBuildConfigStep ($completed = NULL)
   {
-    $this->o_steps[$this->i_config] = new Step_Config($this, $this->captured_values);
+    $this->o_steps[$this->i_config] = new setupStepConfig($this, $this->captured_values);
     if ($completed !== NULL) {
       $this->o_steps[$this->i_config]->is_completed = $completed;
     }
diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 608abbf98d040e942d83ea03e04c43e90353cab6..08182b0e9fe3d3a94830f27ff02ec5d003110b21 100644
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -104,15 +104,11 @@ class setupStep extends simplePlugin
   /* bypass LDAP loading */
   protected function loadAttributes()
   {
-    foreach ($this->attributesInfo as &$sectionInfo) {
-      foreach ($sectionInfo['attrs'] as $name => &$attr) {
+    foreach ($this->attributesInfo as $sectionInfo) {
+      foreach ($sectionInfo['attrs'] as $attr) {
         $attr->setParent($this);
       }
-      unset($attr);
     }
-    unset($sectionInfo);
-
-    $this->updateAttributesValues();
   }
 }
 ?>
diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStepChecks.inc
similarity index 99%
rename from setup/class_setupStep_Checks.inc
rename to setup/class_setupStepChecks.inc
index ad5ca8e38ab5f2d9230ae37c5f16118120f79433..dc8da0e70c4387edf93811f126866d46ef4f66b3 100644
--- a/setup/class_setupStep_Checks.inc
+++ b/setup/class_setupStepChecks.inc
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class Step_Checks extends setupStep
+class setupStepChecks extends setupStep
 {
   var $header_image = 'geticon.php?context=categories&icon=checks&size=48';
 
diff --git a/setup/class_setupStep_Config.inc b/setup/class_setupStepConfig.inc
similarity index 95%
rename from setup/class_setupStep_Config.inc
rename to setup/class_setupStepConfig.inc
index bc5881998a124b13f17075e2a496579fb267a986..55a472f168262a17266536076f5f994f94aaa7a5 100644
--- a/setup/class_setupStep_Config.inc
+++ b/setup/class_setupStepConfig.inc
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class Step_Config_before_init extends setupStep
+class setupStepConfig_before_init extends setupStep
 {
   function update_strings()
   {
@@ -35,7 +35,7 @@ class Step_Config_before_init extends setupStep
   }
 }
 
-class Step_Config extends configInLdap
+class setupStepConfig extends configInLdap
 {
   var $is_active    = FALSE;
   var $is_enabled   = FALSE;
@@ -169,7 +169,7 @@ class Step_Config extends configInLdap
   {
     return TRUE;
   }
-  function getacl($attribute, $skip_write = FALSE)
+  function aclGetPermissions($attribute = '0', $base = NULL, $skipWrite = FALSE)
   {
     return 'cmdrw';
   }
diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStepFinish.inc
similarity index 97%
rename from setup/class_setupStep_Finish.inc
rename to setup/class_setupStepFinish.inc
index 318f4c500dedcc280704ecbdac4607c157f31d50..554f75e14b9717ce1784a3c39dec7b382b52eb73 100644
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStepFinish.inc
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class Step_Finish extends setupStep
+class setupStepFinish extends setupStep
 {
   var $header_image = 'geticon.php?context=devices&icon=server&size=48';
 
@@ -66,7 +66,7 @@ class Step_Finish extends setupStep
     /* Create ui object */
 
     /* got user dn, fill acl's */
-    $ui = new userinfo($config, $cv['valid_admin']);
+    $ui = new userinfo($cv['valid_admin']);
     /* Username is set, load subtreeACL's now */
     $ui->loadACL();
 
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStepLanguage.inc
similarity index 98%
rename from setup/class_setupStep_Language.inc
rename to setup/class_setupStepLanguage.inc
index 088bff6e0ca91930189506c906153d40ce5324ab..589521a41a6798c141c233b8c3dd5867ab2fb9f7 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStepLanguage.inc
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class Step_Language extends setupStep
+class setupStepLanguage extends setupStep
 {
   var $header_image = 'geticon.php?context=applications&icon=config-language&size=48';
 
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStepLdap.inc
similarity index 91%
rename from setup/class_setupStep_Ldap.inc
rename to setup/class_setupStepLdap.inc
index 2b87c1ad0c2b137deb833843cbc3885f13fe0c70..45aae7baa165296a6e0ccd10fe586c1460a1f94f 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStepLdap.inc
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class Step_Ldap extends setupStep
+class setupStepLdap extends setupStep
 {
   var $header_image = 'geticon.php?context=places&icon=network-server&size=48';
 
@@ -113,8 +113,21 @@ class Step_Ldap extends setupStep
   {
     $attr = @LDAP::get_naming_contexts($this->connection);
     unset($attr['count']);
-    $this->attributesAccess['base']->setChoices($attr);
-    $this->attributesAccess['admin']->attributes[1]->setValue(','.$this->base);
+    if (count($attr)) {
+      if (!($this->attributesAccess['base'] instanceof SelectAttribute)) {
+        $this->attributesInfo['connection']['attrs']['base'] = new SelectAttribute(
+          _('Base'), _('The LDAP directory base'),
+          'base', TRUE
+        );
+      }
+      $this->attributesAccess['base']->setChoices($attr);
+      $this->attributesAccess['admin']->attributes[1]->setValue(','.$this->base);
+    } else {
+      $this->attributesInfo['connection']['attrs']['base'] = new StringAttribute(
+        _('Base'), _('The LDAP directory base'),
+        'base', TRUE
+      );
+    }
   }
 
   function save_object()
@@ -186,6 +199,7 @@ class Step_Ldap extends setupStep
   {
     $error = parent::check();
     if (!empty($error)) {
+      $this->update_base_choices();
       return $error;
     } elseif ($this->is_completed) {
       $checked  = check_schema($this->parent->captured_values);
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStepMigrate.inc
similarity index 85%
rename from setup/class_setupStep_Migrate.inc
rename to setup/class_setupStepMigrate.inc
index 984b3a687076ad24aaa688af68595278de2866df..c3d60da3b0bdd7b16c783b3a2e1c904a8353570b 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStepMigrate.inc
@@ -22,15 +22,15 @@
 /****************
  * FUNCTIONS
 
-Step_Migrate                - Constructor.
+setupStepMigrate                - Constructor.
 update_strings              - Used to update the displayed step information.
 initialize_checks           - Initialize migration steps.
 check_ldap_permissions      - Check if the used admin account has full access to the ldap database.
-check_gosaAccounts          - Check if there are users without the required objectClasses.
-migrate_gosaAccounts        - Migrate selected users to FusionDirectory user accounts.
-check_orgUnits   - Check if there are departments, that are not visible for FusionDirectory
-migrate_orgUnits - Migrate selected departments
-check_adminAccount - Check if there is at least one acl entry available
+check_accounts              - Check if there are users without the required objectClasses.
+migrate_accounts            - Migrate selected users to FusionDirectory user accounts.
+check_orgUnits              - Check if there are departments, that are not visible for FusionDirectory
+migrate_orgUnits            - Migrate selected departments
+check_adminAccount          - Check if there is at least one acl entry available
 checkBase                   - Check if there is a root object available
 
 get_user_list               - Get list of available users
@@ -176,7 +176,7 @@ class StepMigrateCheck
   }
 }
 
-class Step_Migrate extends setupStep
+class setupStepMigrate extends setupStep
 {
   var $header_image   = "geticon.php?context=applications&icon=utilities-system-monitor&size=48";
 
@@ -185,7 +185,7 @@ class Step_Migrate extends setupStep
 
   /* Entries needing migration */
   var $orgUnits_toMigrate       = array();
-  var $gosaAccounts_toMigrate   = array();
+  var $accountsToMigrate   = array();
   var $outsideUsers_toMigrate   = array();
   var $outsideGroups_toMigrate  = array();
 
@@ -257,7 +257,7 @@ class Step_Migrate extends setupStep
     $checks = array(
       'baseOC'        => new StepMigrateCheck($this, 'baseOC',        _('Inspecting object classes in root object')),
       'permissions'   => new StepMigrateCheck($this, 'permissions',   _('Checking permission for LDAP database')),
-      'gosaAccounts'  => new StepMigrateCheck($this, 'gosaAccounts',  _('Checking for invisible users')),
+      'accounts'      => new StepMigrateCheck($this, 'accounts',      _('Checking for invisible users')),
       'adminAccount'  => new StepMigrateCheck($this, 'adminAccount',  _('Checking for super administrator')),
       'defaultACLs'   => new StepMigrateCheck($this, 'defaultACLs',   _('Checking for default ACL roles and groups')),
       'outsideUsers'  => new StepMigrateCheck($this, 'outsideUsers',  _('Checking for users outside the people tree')),
@@ -352,9 +352,8 @@ class Step_Migrate extends setupStep
       /* Try to detect base class type, e.g. is it a dcObject */
       $dep_types  = departmentManagement::getDepartmentTypes();
       $dep_type   = "";
-      $attrs['objectClass'][] = 'gosaDepartment';
-
       /* This allow us to filter it as if it was already migrated */
+      $attrs['objectClass'][] = 'gosaDepartment';
       foreach ($dep_types as $type) {
         if (objects::isOfType($attrs, $type)) {
           $dep_type = $type;
@@ -521,7 +520,7 @@ class Step_Migrate extends setupStep
   /* Check if there are users which will
    *  be invisible for FusionDirectory
    */
-  function check_gosaAccounts(&$checkobj)
+  function check_accounts(&$checkobj)
   {
     global $config;
     $ldap = $config->get_ldap_link();
@@ -529,8 +528,8 @@ class Step_Migrate extends setupStep
     /* Remember old list of invisible users, to be able to set
      *  the 'html checked' status for the checkboxes again
      */
-    $old    = $this->gosaAccounts_toMigrate;
-    $this->gosaAccounts_toMigrate = array();
+    $old    = $this->accountsToMigrate;
+    $this->accountsToMigrate = array();
 
     /* Get all invisible users */
     $ldap->cd($config->current['BASE']);
@@ -557,7 +556,7 @@ class Step_Migrate extends setupStep
         if (isset($old[base64_encode($attrs['dn'])])) {
           $attrs['checked'] = $old[base64_encode($attrs['dn'])]['checked'];
         }
-        $this->gosaAccounts_toMigrate[base64_encode($attrs['dn'])] = $attrs;
+        $this->accountsToMigrate[base64_encode($attrs['dn'])] = $attrs;
       }
     }
 
@@ -566,7 +565,7 @@ class Step_Migrate extends setupStep
         _('LDAP query failed'),
         _('Possibly the "root object" is missing.')
       );
-    } elseif (count($this->gosaAccounts_toMigrate) == 0) {
+    } elseif (count($this->accountsToMigrate) == 0) {
       /* No invisible */
       return '';
     } else {
@@ -574,23 +573,23 @@ class Step_Migrate 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->gosaAccounts_toMigrate)
+          count($this->accountsToMigrate)
         ).$checkobj->submit()
       );
     }
   }
 
-  function check_gosaAccounts_migrate (&$checkobj)
+  function check_accounts_migrate (&$checkobj)
   {
     $this->check_multipleGeneric_migrate($checkobj, array('title' => _('User migration')));
   }
 
-  function check_gosaAccounts_migrate_refresh (&$checkobj)
+  function check_accounts_migrate_refresh (&$checkobj)
   {
     return $this->check_multipleGeneric_migrate_refresh($checkobj, array('title' => _('User migration')));
   }
 
-  function check_gosaAccounts_migrate_confirm(&$checkobj, $only_ldif = FALSE)
+  function check_accounts_migrate_confirm(&$checkobj, $only_ldif = FALSE)
   {
     return $this->check_multipleGeneric_migrate_confirm(
       $checkobj,
@@ -606,9 +605,9 @@ class Step_Migrate extends setupStep
     /* Fix displayed dn syntax */
     $infos['entries'] = $this->$var;
     foreach ($infos['entries'] as $key => $data) {
-      $infos['entries'][$key]['dn'] = LDAP::fix($data['dn']);
+      $infos['entries'][$key]['dn'] = $data['dn'];
     }
-    $this->openDialog(new StepMigrateDialog($checkobj, 'setup_migrate_gosaAccounts.tpl', $infos));
+    $this->openDialog(new StepMigrateDialog($checkobj, 'setup_migrate_accounts.tpl', $infos));
   }
 
   function check_multipleGeneric_migrate_refresh (&$checkobj, $infos)
@@ -625,7 +624,7 @@ class Step_Migrate extends setupStep
     $var = $checkobj->name.'_toMigrate';
     $infos['entries'] = $this->$var;
     foreach ($infos['entries'] as $key => $data) {
-      $infos['entries'][$key]['dn'] = LDAP::fix($data['dn']);
+      $infos['entries'][$key]['dn'] = $data['dn'];
     }
     return $infos;
   }
@@ -673,7 +672,7 @@ class Step_Migrate extends setupStep
               _('Migration error'),
               sprintf(
                 _('Cannot migrate entry "%s":').'<br/><br/><i>%s</i>',
-                LDAP::fix($attrs['dn']), $ldap->get_error()
+                $attrs['dn'], $ldap->get_error()
               ),
               ERROR_DIALOG
             );
@@ -691,9 +690,6 @@ class Step_Migrate extends setupStep
   {
     global $config;
 
-    /* Reset settings */
-    $FD_1_0_8_found = FALSE;
-
     /* Establish ldap connection */
     $ldap = $config->get_ldap_link();
     $ldap->cd($config->current['BASE']);
@@ -705,8 +701,7 @@ class Step_Migrate extends setupStep
         _('Possibly the "root object" is missing.')
       );
     } else {
-      $FD_1_0_8_found = FALSE;
-      $FD_1_0_7_found = FALSE;
+      $FD_admin_found = FALSE;
 
       $attrs = $ldap->fetch();
 
@@ -718,131 +713,70 @@ class Step_Migrate extends setupStep
         $rusers[$user_attrs['uid'][0]] = $user_attrs['dn'];
       }
       $groups = array();
-      $ldap->search("objectClass=posixGroup", array("cn","dn"));
+      $ldap->search('(objectClass=posixGroup)', array('cn','dn'));
       while ($group_attrs = $ldap->fetch()) {
         $groups[$group_attrs['dn']] = $group_attrs['cn'][0];
       }
+      $roles = array();
+      $ldap->search('(objectClass=organizationalRole)', array('cn','dn'));
+      while ($role_attrs = $ldap->fetch()) {
+        $roles[$role_attrs['dn']] = $role_attrs['cn'][0];
+      }
 
-      /* Check if a valid FusionDirectory 1.0.8 admin exists
+      /* Check if a valid FusionDirectory admin exists
           -> gosaAclEntry for an existing and accessible user.
        */
-      $valid_users  = "";
-      $valid_groups = "";
+      $valid_users  = '';
+      $valid_groups = '';
+      $valid_roles  = '';
       if (isset($attrs['gosaAclEntry'])) {
         $acls = $attrs['gosaAclEntry'];
         for ($i = 0; $i < $acls['count']; $i++) {
           $acl = $acls[$i];
-          $tmp = explode(":", $acl);
+          $tmp = explode(':', $acl);
 
-          if ($tmp[1] == "subtree") {
+          if ($tmp[1] == 'subtree') {
             /* Check if acl owner is a valid FusionDirectory user account */
-            $ldap->cat(base64_decode($tmp[2]), array("gosaAclTemplate"), '(gosaAclTemplate=*:all;cmdrw)');
+            $ldap->cat(base64_decode($tmp[2]), array('gosaAclTemplate'), '(gosaAclTemplate=*:all;cmdrw)');
             if ($ldap->count()) {
-              $members = explode(",", $tmp[3]);
+              $members = explode(',', $tmp[3]);
               foreach ($members as $member) {
                 $member = base64_decode($member);
 
                 if (isset($users[$member])) {
-                  $valid_users    .= $users[$member].", ";
-                  $FD_1_0_8_found = TRUE;
+                  $valid_users    .= $users[$member].', ';
+                  $FD_admin_found = TRUE;
                 }
                 if (isset($groups[$member])) {
                   $ldap->cat($member);
                   $group_attrs = $ldap->fetch();
-                  $val_users = "";
+                  $val_users = '';
                   if (isset($group_attrs['memberUid'])) {
                     for ($e = 0; $e < $group_attrs['memberUid']['count']; $e ++) {
                       if (isset($rusers[$group_attrs['memberUid'][$e]])) {
-                        $val_users .= $group_attrs['memberUid'][$e].", ";
+                        $val_users .= $group_attrs['memberUid'][$e].', ';
                       }
                     }
                   }
                   if (!empty($val_users)) {
-                    $valid_groups .= $groups[$member]."(<i>".trim($val_users, ", ")."</i>), ";
-                    $FD_1_0_8_found  = TRUE;
+                    $valid_groups .= $groups[$member].'(<i>'.trim($val_users, ', ').'</i>), ';
+                    $FD_admin_found  = TRUE;
                   }
                 }
-              }
-            }
-          }
-        }
-      }
-
-      /* Try to find an old FD 1.0.7 administrator account that may be migrated */
-      if (!$FD_1_0_8_found) {
-        $valid_users  = "";
-        $valid_groups = "";
-        if (isset($attrs['gosaAclEntry'])) {
-          $acls = $attrs['gosaAclEntry'];
-          for ($i = 0; $i < $acls['count']; $i++) {
-            $acl = $acls[$i];
-            $tmp = explode(":", $acl);
-
-            if ($tmp[1] == "psub") {
-              $members = explode(",", $tmp[2]);
-              foreach ($members as $member) {
-                $member = base64_decode($member);
-                if (isset($users[$member])) {
-                  if (preg_match("/all;cmdrw/i", $tmp[3])) {
-                    $valid_users    .= $users[$member].", ";
-                    $FD_1_0_7_found = TRUE;
-                  }
-                }
-                if (isset($groups[$member])) {
-                  if (preg_match("/all;cmdrw/i", $tmp[3])) {
-                    $ldap->cat($member);
-                    $group_attrs = $ldap->fetch();
-                    $val_users = "";
-                    if (isset($group_attrs['memberUid'])) {
-                      for ($e = 0; $e < $group_attrs['memberUid']['count']; $e++) {
-                        if (isset($rusers[$group_attrs['memberUid'][$e]])) {
-                          $val_users .= $group_attrs['memberUid'][$e].", ";
-                        }
+                if (isset($roles[$member])) {
+                  $ldap->cat($member);
+                  $role_attrs = $ldap->fetch();
+                  $val_users = '';
+                  if (isset($role_attrs['roleOccupant'])) {
+                    for ($e = 0; $e < $role_attrs['roleOccupant']['count']; $e ++) {
+                      if (isset($users[$role_attrs['roleOccupant'][$e]])) {
+                        $val_users .= $users[$role_attrs['roleOccupant'][$e]].', ';
                       }
                     }
-                    if (!empty($val_users)) {
-                      $valid_groups .= $groups[$member]."(<i>".trim($val_users, ", ")."</i>), ";
-                      $FD_1_0_7_found  = TRUE;
-                    }
                   }
-                }
-              }
-            } elseif ($tmp[1] == "role") {
-              /* Check if acl owner is a valid FusionDirectory user account */
-              $ldap->cat(base64_decode($tmp[2]), array("gosaAclTemplate"));
-              $ret = $ldap->fetch();
-
-              if (isset($ret['gosaAclTemplate'])) {
-                $cnt = $ret['gosaAclTemplate']['count'];
-                for ($j = 0; $j < $cnt; $j++) {
-                  $a_str = $ret['gosaAclTemplate'][$j];
-                  if (preg_match("/^[0-9]*:psub:/", $a_str) && preg_match("/:all;cmdrw$/", $a_str)) {
-
-                    $members = explode(",", $tmp[3]);
-                    foreach ($members as $member) {
-                      $member = base64_decode($member);
-
-                      if (isset($users[$member])) {
-                        $valid_users    .= $users[$member].", ";
-                        $FD_1_0_7_found = TRUE;
-                      }
-                      if (isset($groups[$member])) {
-                        $ldap->cat($member);
-                        $group_attrs = $ldap->fetch();
-                        $val_users = "";
-                        if (isset($group_attrs['memberUid'])) {
-                          for ($e = 0; $e < $group_attrs['memberUid']['count']; $e ++) {
-                            if (isset($rusers[$group_attrs['memberUid'][$e]])) {
-                              $val_users .= $group_attrs['memberUid'][$e].", ";
-                            }
-                          }
-                        }
-                        if (!empty($val_users)) {
-                          $valid_groups .= $groups[$member]."(<i>".trim($val_users, ", ")."</i>), ";
-                          $FD_1_0_7_found  = TRUE;
-                        }
-                      }
-                    }
+                  if (!empty($val_users)) {
+                    $valid_roles .= $roles[$member].'(<i>'.trim($val_users, ', ').'</i>), ';
+                    $FD_admin_found  = TRUE;
                   }
                 }
               }
@@ -852,27 +786,16 @@ class Step_Migrate extends setupStep
       }
 
       /* Print out results */
-      if ($FD_1_0_7_found) {
-        $str = "";
+      if ($FD_admin_found) {
+        $str = '';
         if (!empty($valid_users)) {
-          $str .= '<i>'.sprintf(_('FD 1.0.7 administrative accounts found: %s'), trim($valid_users, ', ')).'</i><br/>';
+          $str .= '<b>'._('Users').'</b>:&nbsp;'.trim($valid_users, ', ').'<br/>';
         }
         if (!empty($valid_groups)) {
-          $str .= '<i>'.sprintf(_('FD 1.0.7 administrative groups found: %s'), trim($valid_groups, ', ')).'</i><br/>';
+          $str .= '<b>'._('Groups').'</b>:&nbsp;'.trim($valid_groups, ', ').'<br/>';
         }
-        $str .= _('You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config file at the end of the setup to migrate it.<br/>');
-        throw new CheckFailedException(
-          _('Failed'),
-          $str._('There is no valid FusionDirectory 1.0.8 administrator account inside your LDAP.').'&nbsp;'.
-          $checkobj->submit(_('Create'), 'create')
-        );
-      } elseif ($FD_1_0_8_found) {
-        $str = "";
-        if (!empty($valid_users)) {
-          $str .= "<b>"._("Users")."</b>:&nbsp;".trim($valid_users, ", ")."<br>";
-        }
-        if (!empty($valid_groups)) {
-          $str .= "<b>"._("Groups")."</b>:&nbsp;".trim($valid_groups, ", ")."<br>";
+        if (!empty($valid_roles)) {
+          $str .= '<b>'._('Roles').'</b>:&nbsp;'.trim($valid_roles, ', ').'<br/>';
         }
         return $str;
       } else {
@@ -884,7 +807,7 @@ class Step_Migrate extends setupStep
       }
     }
 
-    /* Reload base OC */
+    // Reload base OC
     $this->checks['baseOC']->run();
     return '';
   }
@@ -930,14 +853,11 @@ class Step_Migrate extends setupStep
     $_POST[$tabObject->current.'_posted'] = TRUE;
     $_POST['dialog_refresh']              = TRUE;
     $tabObject->save_object();
-    $errors = $tabObject->check();
+    $errors = $tabObject->save();
     if (!empty($errors)) {
-      foreach ($errors as $error) {
-        msg_dialog::display(_('Error'), $error, ERROR_DIALOG);
-      }
+      msg_dialog::displayChecks($errors);
       return FALSE;
     }
-    $tabObject->save();
     $admindn = $tabObject->dn;
 
     /* Assigning role */
@@ -1028,7 +948,7 @@ class Step_Migrate extends setupStep
             _('Migration error'),
             sprintf(
               _('Cannot add ACL role "%s":').'<br/><br/><i>%s</i>',
-              LDAP::fix($dn), $ldap->get_error()
+              $dn, $ldap->get_error()
             ),
             ERROR_DIALOG
           );
@@ -1315,7 +1235,6 @@ class Step_Migrate extends setupStep
         sprintf(_('Found %s department(s) that will not be visible in FusionDirectory.'), count($this->orgUnits_toMigrate)).
         '&nbsp;'.$checkobj->submit()
       );
-      /* TODO: maybe warnings should be an other kind of exception? */
     }
   }
 
diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStepWelcome.inc
similarity index 98%
rename from setup/class_setupStep_Welcome.inc
rename to setup/class_setupStepWelcome.inc
index a2a2d2874a0fda488188d6a43e067b377b57354c..0f5f0755fd3cdd0e1a795c3be894b46d9085779e 100644
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStepWelcome.inc
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class Step_Welcome extends setupStep
+class setupStepWelcome extends setupStep
 {
   var $header_image = 'geticon.php?context=applications&icon=config-welcome&size=48';
 
diff --git a/setup/setup_migrate_gosaAccounts.tpl b/setup/setup_migrate_accounts.tpl
similarity index 100%
rename from setup/setup_migrate_gosaAccounts.tpl
rename to setup/setup_migrate_accounts.tpl